Changeset 762 for branches


Ignore:
Timestamp:
Aug 7, 2006, 10:37:26 AM (13 years ago)
Author:
bruno
Message:

merge -r760:761 $SVN_M/branches/stable

Location:
branches/2.0.9
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0.9/mindi-kernel/distributions/mandriva/spec.m4

    r723 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `')dnl
  • branches/2.0.9/mindi-kernel/distributions/redhat/spec.m4

    r723 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.gz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `')dnl
  • branches/2.0.9/mindi-kernel/distributions/suse/spec.m4

    r724 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, syslinux')dnl
  • branches/2.0.9/mindi/distributions/mandriva/spec.m4

    r723 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, which, grep >= 2.5')dnl
  • branches/2.0.9/mindi/distributions/redhat/spec.m4

    r723 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.gz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, which, grep >= 2.5')dnl
  • branches/2.0.9/mindi/distributions/suse/spec.m4

    r724 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, syslinux')dnl
  • branches/2.0.9/mondo-doc/distributions/gentoo/mondo.ebuild

    r572 r762  
    99DESCRIPTION="The premier GPL disaster recovery solution."
    1010HOMEPAGE="http://www.mondorescue.org"
    11 SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}.tgz"
     11SRC_URI="ftp://ftp.mondorescue.org/src/${PN/-rescue/}-${PV}.tgz"
    1212
    1313LICENSE="GPL-2"
  • branches/2.0.9/mondo-doc/distributions/mandriva/spec.m4

    r723 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', )dnl
  • branches/2.0.9/mondo-doc/distributions/redhat/spec.m4

    r723 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.gz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', )dnl
  • branches/2.0.9/mondo-doc/distributions/suse/spec.m4

    r724 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, buffer, cdrecord')dnl
  • branches/2.0.9/mondo/distributions/gentoo/mondo.ebuild

    r732 r762  
    99DESCRIPTION="The premier GPL disaster recovery solution."
    1010HOMEPAGE="http://www.mondorescue.org"
    11 SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}.tar.gz"
     11SRC_URI="ftp://ftp.mondorescue.org/src/${PN/-rescue/}-${PV}.tar.gz"
    1212
    1313LICENSE="GPL-2"
  • branches/2.0.9/mondo/distributions/mandriva/spec.m4

    r724 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', )dnl
  • branches/2.0.9/mondo/distributions/redhat/spec.m4

    r723 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.gz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', )dnl
  • branches/2.0.9/mondo/distributions/suse/spec.m4

    r724 r762  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, buffer, cdrecord')dnl
  • branches/2.0.9/mondo/mondo/Makefile.am

    r714 r762  
    44pkgdata_DATA   = do-not-compress-these
    55scriptdir      = $(pkgdatadir)
    6 script_DATA    = autorun
    7 
    8 install-data-hook:
    9     @for prog in $(script_DATA); do \
    10       chmod +x $(scriptdir)/$$prog; \
    11     done
     6script_SCRIPTS    = autorun
  • branches/2.0.9/tools/build2pkg

    r758 r762  
    8282        rm -rf $p-${PVER}
    8383
    84         rpmbuild -ba $p.spec 2> $log 1> $log
     84        rpmbuild -ba $p.spec 2>&1 | tee $log
    8585        if [ $? != 0 ]; then
    86             cat $log
    8786            status=-1
    8887        else
    89             egrep '^Wrote:' $log
    9088            if [ -f /usr/bin/rpmlint ]; then
    9189                /usr/bin/rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
Note: See TracChangeset for help on using the changeset viewer.