[CVS] RPM: rpm/ autogen.sh devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 21-Jun-2007 08:55:01
Branch: HEAD Handle: 2007062107550100
Modified files:
rpm autogen.sh devtool.conf
Log:
completely cleanup the auto-generate stuff
Summary:
RevisionChanges Path
2.78+40 -121rpm/autogen.sh
2.8 +1 -2 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/autogen.sh
$ cvs diff -u -r2.77 -r2.78 autogen.sh
--- rpm/autogen.sh21 Jun 2007 06:36:07 - 2.77
+++ rpm/autogen.sh21 Jun 2007 06:55:01 - 2.78
@@ -1,136 +1,55 @@
#!/bin/sh
-# establish a secure temporary directory
-{
-tmpdir=
-trap 'exit_status=$?; { test -z $tmpdir || test ! -d $tmpdir || rm
-rf $tmpdir; } exit $exit_status' 0 1 2 13 15
-}
-{
-tmpdir=`(umask 077 mktemp -d './.autogenXX') 2/dev/null`
-[ -n $tmpdir ] [ -d $tmpdir ]
-} || {
-tmpdir=./.autogen$$
-(umask 077 mkdir $tmpdir) 2/dev/null
-} || {
-echo $0: cannot create a temporary directory 12
-exit 1
-}
-
-export CFLAGS
-export LDFLAGS
-
-LTV=libtoolize (GNU libtool) 1.5.22
-ACV=autoconf (GNU Autoconf) 2.61
+# configure the requirements
AMV=automake (GNU automake) 1.10
+ACV=autoconf (GNU Autoconf) 2.61
+LTV=libtoolize (GNU libtool) 1.5.22
+GTT=gettextize (GNU gettext-tools) 0.16.1
USAGE=
-This script documents the versions of the tools I'm using to build rpm:
- libtool-1.5.22
- autoconf-2.61
- automake-1.10
-Simply edit this script to change the libtool/autoconf/automake versions
-checked if you need to, as rpm should build (and has built) with all
-recent versions of libtool/autoconf/automake.
+To build RPM from plain CVS sources the following
+installed developer tools are mandatory:
+GNU automake 1.10
+GNU autoconf 2.61
+GNU libtool 1.5.22
+GNU gettext 0.16.1
-libtoolize=`which glibtoolize 2/dev/null`
-case $libtoolize in
-/*) ;;
-*) libtoolize=`which libtoolize 2/dev/null`
-case $libtoolize in
-/*) ;;
-*) libtoolize=libtoolize
-esac
-esac
-
-# run GNU gettext's gettextize(1) in batch mode
-gettextize () {
-_gettextize=`which gettextize 2/dev/null`
-case $_gettextize in
+# wrapper for running GNU libtool's libtoolize(1)
+libtoolize () {
+_libtoolize=`which glibtoolize 2/dev/null`
+case $_libtoolize in
/* ) ;;
-* ) echo $0: gettextize: not found 12; exit 1 ;;
+* ) _libtoolize=`which libtoolize 2/dev/null`
+ case $_libtoolize in
+ /* ) ;;
+ * ) _libtoolize=libtoolize ;;
+ esac
+ ;;
esac
-perl -e '
-my $sh = join(, STDIN);
-$sh =~ s|read\s+dummy\s*\s*/dev/tty||s;
-$sh =~ s|if\s+\$doit;\s+then\s+echo\s+\$please|if false; then|s;
-print STDOUT $sh;
-' $_gettextize $tmpdir/gettextize.sh
-sh $tmpdir/gettextize.sh ${1+$@}
+$_libtoolize ${1+$@}
}
-[ `$libtoolize --version | head -1` != $LTV ] echo $USAGE # exit
1
-[ `autoconf --version | head -1` != $ACV ] echo $USAGE # exit 1
-[ `automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'` != $AMV ]
echo $USAGE # exit 1
-
-myopts=
-if [ X$* = X -a X`uname -s` = XDarwin -a -d /opt/local ]; then
-export myprefix=/opt/local
-export myopts=--prefix=${myprefix} --disable-nls
-export CPPFLAGS=-I${myprefix}/include
-fi
-
-if [ -d popt ]; then
-(echo --- popt; cd popt; sh ./autogen.sh --noconfigure $@)
-fi
-if [ -d zlib ]; then
-(echo --- zlib; cd zlib; sh ./autogen.sh --noconfigure $@)
-fi
-if [ -d beecrypt ]; then
-(echo --- beecrypt; cd beecrypt; sh ./autogen.sh --noconfigure $@)
-fi
-if [ -d elfutils ]; then
-(echo --- elfutils; cd elfutils; sh ./autogen.sh --noconfigure $@)
-fi
-if [ -d file ]; then
-(echo --- file; cd file; sh ./autogen.sh --noconfigure $@)
-fi
-if [ -d neon ]; then
-(echo --- neon; cd neon; sh ./autogen.sh $@)
-fi
-if [ -d syck ]; then
-(echo --- syck; cd syck; sh ./bootstrap $@)
-fi
-#if [ -d sqlite ]; then
-#(echo --- sqlite; cd sqlite; sh ./autogen.sh --disable-tcl $@)
-#fi
-if [ -d xar ]; then
-(echo --- xar; cd xar; sh ./autogen.sh $@)
-fi
-if [ -d yaml ]; then
-(echo --- yaml; cd yaml; sh ./autogen.sh $@)
-fi
-
-echo
[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 21-Jun-2007 11:27:25
Branch: HEAD Handle: 2007062110272500
Modified files:
rpm configure.ac
Log:
consistently use AS_HELP_STRING instead of manually formatted
descriptions as AS_HELP_STRING automatically calculates the necessary
padding, wordwraps, etc.
Summary:
RevisionChanges Path
2.103 +4 -4 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.102 -r2.103 configure.ac
--- rpm/configure.ac 21 Jun 2007 08:15:48 - 2.102
+++ rpm/configure.ac 21 Jun 2007 09:27:25 - 2.103
@@ -840,7 +840,7 @@
dnl Auto-detect whether perl bindings should be built.
dnl
withval=auto
-AC_ARG_WITH(perl, [ --with-perl build rpm perl bindings ])
+AC_ARG_WITH(perl, AS_HELP_STRING([--with-perl], [build with RPM Perl
language bindings]))
WITH_PERL_VERSION=$withval
if test $WITH_PERL_VERSION != no ; then
WITH_PERL_SUBDIR=perl
@@ -857,7 +857,7 @@
dnl Auto-detect which python bindings should be built.
dnl
withval=auto
-AC_ARG_WITH(python, [ --with-python build rpm python bindings ])
+AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python
language bindings]))
WITH_PYTHON_VERSION=$withval
if test $withval = auto ; then
@@ -939,7 +939,7 @@
dnl Auto-detect whether doxygen generated API docs should be included.
dnl
withval=auto
-AC_ARG_WITH(apidocs, [ --with-apidocs build rpm API docs ])
+AC_ARG_WITH(apidocs, AS_HELP_STRING([--with-apidocs], [build RPM API
documentation]))
if test $withval = auto -a $__DOXYGEN != no ; then
withval=yes
@@ -961,7 +961,7 @@
*-*-linux*) with_selinuxval=yes ;;
esac
withval=${with_selinuxval}
-AC_ARG_WITH(selinux, [ --with-selinux build with selinux support ])
+AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [build RPM with
SELinux support]))
if test $withval != no ; then
AC_DEFINE(WITH_SELINUX, 1, [Build with selinux support?])
WITH_SELINUX_LIB=-lselinux
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/intl/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 11:53:14 Branch: HEAD Handle: 2007062110531300 Removed files: rpm/intl.cvsignore Log: as we do not ship a local intl/ subdir there is no (more) need for keeping this (now) empty directory Summary: RevisionChanges Path 1.5 +0 -64 rpm/intl/.cvsignore rm -f rpm/intl/.cvsignore '@@ .' Index: rpm/intl/.cvsignore [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ fs.c rpm/rpmio/ rpmdav.c rpmdav.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 13:24:11 Branch: HEAD Handle: 2007062112241000 Modified files: rpm/lib fs.c rpm/rpmio rpmdav.c rpmdav.h Log: fix building under NetBSD 3.1 Summary: RevisionChanges Path 2.51+4 -0 rpm/lib/fs.c 2.36+2 -2 rpm/rpmio/rpmdav.c 2.14+1 -1 rpm/rpmio/rpmdav.h patch -p0 '@@ .' Index: rpm/lib/fs.c $ cvs diff -u -r2.50 -r2.51 fs.c --- rpm/lib/fs.c 18 Jun 2007 17:31:23 - 2.50 +++ rpm/lib/fs.c 21 Jun 2007 11:24:10 - 2.51 @@ -170,7 +170,11 @@ getmntinfo_r(mounts, flags, mntCount, bufSize); # elif HAVE_GETMNTINFO /* This is Mac OS X */ +#if defined(__NetBSD__) +struct statvfs * mounts = NULL; +#else struct statfs * mounts = NULL; +#endif int mntCount = 0, flags = MNT_NOWAIT; int nextMount = 0; @@ . patch -p0 '@@ .' Index: rpm/rpmio/rpmdav.c $ cvs diff -u -r2.35 -r2.36 rpmdav.c --- rpm/rpmio/rpmdav.c17 Jun 2007 14:49:02 - 2.35 +++ rpm/rpmio/rpmdav.c21 Jun 2007 11:24:10 - 2.36 @@ -1544,7 +1544,7 @@ dp-d_reclen = 0;/* W2DO? */ #if !(defined(hpux) || defined(__hpux) || defined(sun)) -#if !defined(__APPLE__) !defined(__FreeBSD_kernel__) !defined(__FreeBSD__) +#if !defined(__APPLE__) !defined(__FreeBSD_kernel__) !defined(__FreeBSD__) !defined(__NetBSD__) dp-d_off = 0; /* W2DO? */ #endif /[EMAIL PROTECTED]@*/ @@ -1668,7 +1668,7 @@ dp-d_reclen = 0;/* W2DO? */ #if !(defined(hpux) || defined(__hpux) || defined(sun)) -#if !defined(__APPLE__) !defined(__FreeBSD_kernel__) !defined(__FreeBSD__) +#if !defined(__APPLE__) !defined(__FreeBSD_kernel__) !defined(__FreeBSD__) !defined(__NetBSD__) dp-d_off = 0; /* W2DO? */ #endif /[EMAIL PROTECTED]@*/ @@ . patch -p0 '@@ .' Index: rpm/rpmio/rpmdav.h $ cvs diff -u -r2.13 -r2.14 rpmdav.h --- rpm/rpmio/rpmdav.h15 Jun 2007 14:27:52 - 2.13 +++ rpm/rpmio/rpmdav.h21 Jun 2007 11:24:10 - 2.14 @@ -30,7 +30,7 @@ typedef struct __dirstream * AVDIR; typedef struct __dirstream * DAVDIR; #else -# if defined(__FreeBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) typedef struct __dirstream * AVDIR; typedef struct __dirstream * DAVDIR; #else/* __FreeBSD__ */ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmsw.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 14:14:25 Branch: HEAD Handle: 2007062113142500 Modified files: rpm/rpmio rpmsw.c Log: please use Linux-specific i386 assembly stuff under Linux only Summary: RevisionChanges Path 2.11+1 -1 rpm/rpmio/rpmsw.c patch -p0 '@@ .' Index: rpm/rpmio/rpmsw.c $ cvs diff -u -r2.10 -r2.11 rpmsw.c --- rpm/rpmio/rpmsw.c 9 Apr 2003 21:46:31 - 2.10 +++ rpm/rpmio/rpmsw.c 21 Jun 2007 12:14:25 - 2.11 @@ -27,7 +27,7 @@ /[EMAIL PROTECTED]@*/ static int rpmsw_initialized = 0; -#if defined(__i386__) +#if defined(__linux__) defined(__i386__) /* Swiped from glibc-2.3.2 sysdeps/i386/i686/hp-timing.h */ #define HP_TIMING_ZERO(Var) (Var) = (0) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ getdate.c getdate.y rpm/ system.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 14:51:38 Branch: HEAD Handle: 2007062113513700 Modified files: rpm system.h rpm/lib getdate.c getdate.y Log: RPM since a longer time no longer checks for the ancient malloc.h and this way there is never a HAVE_MALLOC_H defined, so kick out this stuff at all. BTW, including the non-POSIX header malloc.h on platforms like FreeBSD even causes an #error and this way the build to fail. The correct way (since more than a decade) is to include stdlib.h, of course. Summary: RevisionChanges Path 1.12+0 -4 rpm/lib/getdate.c 1.6 +0 -4 rpm/lib/getdate.y 2.65+0 -4 rpm/system.h patch -p0 '@@ .' Index: rpm/lib/getdate.c $ cvs diff -u -r1.11 -r1.12 getdate.c --- rpm/lib/getdate.c 25 May 2007 17:36:02 - 1.11 +++ rpm/lib/getdate.c 21 Jun 2007 12:51:37 - 1.12 @@ -194,10 +194,6 @@ #include stdlib.h #endif -#if HAVE_MALLOC_H !defined(__LCLINT__) -#include malloc.h -#endif - /* NOTES on rebuilding getdate.c (particularly for inclusion in CVS releases): @@ . patch -p0 '@@ .' Index: rpm/lib/getdate.y $ cvs diff -u -r1.5 -r1.6 getdate.y --- rpm/lib/getdate.y 25 May 2007 17:36:02 - 1.5 +++ rpm/lib/getdate.y 21 Jun 2007 12:51:37 - 1.6 @@ -95,10 +95,6 @@ #include stdlib.h #endif -#if HAVE_MALLOC_H !defined(__LCLINT__) -#include malloc.h -#endif - /* NOTES on rebuilding getdate.c (particularly for inclusion in CVS releases): @@ . patch -p0 '@@ .' Index: rpm/system.h $ cvs diff -u -r2.64 -r2.65 system.h --- rpm/system.h 10 Jun 2007 20:44:42 - 2.64 +++ rpm/system.h 21 Jun 2007 12:51:37 - 2.65 @@ -291,10 +291,6 @@ #include err.h #endif -#if HAVE_MALLOC_H !defined(__LCLINT__) -#include malloc.h -#endif - #if HAVE_LIBGEN_H #include libgen.h #endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-4_5: rpm/ configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Olivier Thauvin
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 21-Jun-2007 15:05:48
Branch: rpm-4_5 Handle: 2007062114054800
Modified files: (Branch: rpm-4_5)
rpm configure.ac
Log:
- readd vendor macros file in default list
Summary:
RevisionChanges Path
2.70.2.14 +1 -1 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.70.2.13 -r2.70.2.14 configure.ac
--- rpm/configure.ac 16 Jun 2007 23:07:07 - 2.70.2.13
+++ rpm/configure.ac 21 Jun 2007 13:05:48 - 2.70.2.14
@@ -1480,7 +1480,7 @@
[Full path to rpm system configuration directory (usually /etc/rpm)])
AC_SUBST(SYSCONFIGDIR)
-MACROFILES=${USRLIBRPM}/${VERSION}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros
+MACROFILES=${USRLIBRPM}/${VERSION}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/%{_host_vendor}/macros:${SYSCONFIGDIR}/%{_host_vendor}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros.d/*.macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros
AC_DEFINE_UNQUOTED(MACROFILES, $MACROFILES,
[Colon separated paths of macro files to read.])
AC_SUBST(MACROFILES)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ INSTALL
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 15:24:15 Branch: HEAD Handle: 2007062114241500 Modified files: rpm INSTALL Log: try to better document that zlib is technically optional (even if enabled by default) but the use of the modified local copy is strongly recommended Summary: RevisionChanges Path 2.12+6 -5 rpm/INSTALL patch -p0 '@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.11 -r2.12 INSTALL --- rpm/INSTALL 21 Jun 2007 09:12:14 - 2.11 +++ rpm/INSTALL 21 Jun 2007 13:24:15 - 2.12 @@ -30,11 +30,11 @@ BeeCryptmandatory 4.0 4.1.2 http://www.virtualunlimited.com/products/beecrypt/ Neonmandatory 0.260.26.3 http://www.webdav.org/neon/ File/magic mandatory 4.0 4.21ftp://ftp.astron.com/pub/file/ -Berkeley-DB [+] mandatory - 4.5.20 http://www.oracle.com/database/berkeley-db.html +Berkeley-DB [1] mandatory - 4.5.20 http://www.oracle.com/database/berkeley-db.html SQLite optional 3.3 3.4.0 http://www.sqlite.org/ -ZLib [*]optional 1.2 1.2.3 http://www.zlib.net/ +ZLib [2]optional 1.2 1.2.3 http://www.zlib.net/ GNU bzip2 optional 1.0 1.0.4 http://www.bzip2.org/ -Lua [+] optional - 5.0 http://www.lua.org/ +Lua [3] optional - 5.0 http://www.lua.org/ GNU gettext optional 1.161.16.1 http://www.gnu.org/software/gettext/ GNU iconv optional 1.111.11 http://www.gnu.org/software/libiconv/ DMalloc optional 5 5.5.2 http://dmalloc.com/ @@ -43,8 +43,9 @@ Linux ELFUtils optional ? 0.127 ? --- - --- --- - -[*] modified copy shipped with RPM distribution -[+] modified copy shipped with RPM distribution, external one (still) not supported +[1] db: modified copy bundled with RPM, stock external one not supported +[2] zlib: modified copy bundled with RPM, stock external one not recommended +[3] lua: modified copy bundled with RPM, stock external one not supported Run-Time @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ parsePrep.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 21-Jun-2007 15:53:44
Branch: HEAD Handle: 2007062114534400
Modified files:
rpm CHANGES
rpm/build parsePrep.c
Log:
Although %setup and %patch look like regular RPM macros on the first
spot they are not real macros, of course. Instead they are parsed and
treated very special by RPM internally.
Unfortunately, this internal handling didn't allow for any leading
whitespaces in front of %setup and %patch in *.spec files. This is a
problem if one uses ultra strictly formatted .spec files (as we do in
OpenPKG) where all section content is consequently indented.
Hence for cosmetics and consistency addicts like me this short-coming in
the parsing of %setup and %patch was never acceptable, so I applied this
little change to the OpenPKG RPM since six years now. I think it will
not cause trouble, but better to let it be reviewed by others first.
Summary:
RevisionChanges Path
1.1386 +1 -0 rpm/CHANGES
2.73+7 -4 rpm/build/parsePrep.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1385 -r1.1386 CHANGES
--- rpm/CHANGES 21 Jun 2007 12:25:43 - 1.1385
+++ rpm/CHANGES 21 Jun 2007 13:53:44 - 1.1386
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- rse: allow leading whitespaces on %setup and %patch lines in *.spec
files
- rse: resolve portability issue related to double definition of
mergesort(3)
- rse: fix building under UnixWare (blind port)
- rse: fix building under FreeBSD 7-CURRENT
@@ .
patch -p0 '@@ .'
Index: rpm/build/parsePrep.c
$ cvs diff -u -r2.72 -r2.73 parsePrep.c
--- rpm/build/parsePrep.c 19 Jun 2007 13:48:44 - 2.72
+++ rpm/build/parsePrep.c 21 Jun 2007 13:53:44 - 2.73
@@ -674,6 +674,7 @@
int nextPart, res, rc;
StringBuf sb;
char **lines, **saveLines;
+char *cp;
if (spec-prep != NULL) {
rpmError(RPMERR_BADSPEC, _(line %d: second %%prep\n), spec-lineNum);
@@ -713,11 +714,13 @@
/[EMAIL PROTECTED]@*/
for (lines = saveLines; *lines; lines++) {
res = 0;
+ for (cp = *lines; *cp == ' ' || *cp == '\t'; cp++)
+ ;
/[EMAIL PROTECTED]@*/
- if (! strncmp(*lines, %setup, sizeof(%setup)-1)) {
- res = doSetupMacro(spec, *lines);
- } else if (! strncmp(*lines, %patch, sizeof(%patch)-1)) {
- res = doPatchMacro(spec, *lines);
+ if (! strncmp(cp, %setup, sizeof(%setup)-1)) {
+ res = doSetupMacro(spec, cp);
+ } else if (! strncmp(cp, %patch, sizeof(%patch)-1)) {
+ res = doPatchMacro(spec, cp);
} else {
appendLineStringBuf(spec-prep, *lines);
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpmqv.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 17:55:29 Branch: HEAD Handle: 2007062116552900 Modified files: rpm CHANGES rpmqv.c Log: merge from rpm-4_5: allow -bb --short-circuit Summary: RevisionChanges Path 1.1387 +1 -0 rpm/CHANGES 1.114 +2 -0 rpm/rpmqv.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1386 -r1.1387 CHANGES --- rpm/CHANGES 21 Jun 2007 13:53:44 - 1.1386 +++ rpm/CHANGES 21 Jun 2007 15:55:29 - 1.1387 @@ -1,4 +1,5 @@ 4.5 - 5.0: +- fray: allow -bb --short-circuit - rse: allow leading whitespaces on %setup and %patch lines in *.spec files - rse: resolve portability issue related to double definition of mergesort(3) - rse: fix building under UnixWare (blind port) @@ . patch -p0 '@@ .' Index: rpm/rpmqv.c $ cvs diff -u -r1.113 -r1.114 rpmqv.c --- rpm/rpmqv.c 25 May 2007 17:35:52 - 1.113 +++ rpm/rpmqv.c 21 Jun 2007 15:55:29 - 1.114 @@ -644,6 +644,8 @@ case 'b': ba-buildAmount |= RPMBUILD_PACKAGEBINARY; ba-buildAmount |= RPMBUILD_CLEAN; + if ((ba-buildChar == 'b') ba-shortCircuit) + /[EMAIL PROTECTED]@*/ break; /[EMAIL PROTECTED]@*/ case 'i': ba-buildAmount |= RPMBUILD_INSTALL; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/build/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 20:19:01 Branch: HEAD Handle: 200706211919 Modified files: rpm/build Makefile.am Log: nuke a dangling symlink for rpmfile.h. File/magic is already externally and rpmfile.h is not used anywhere in the code and now points to nowhere anyway Summary: RevisionChanges Path 2.56+2 -7 rpm/build/Makefile.am patch -p0 '@@ .' Index: rpm/build/Makefile.am $ cvs diff -u -r2.55 -r2.56 Makefile.am --- rpm/build/Makefile.am 20 Jun 2007 21:10:21 - 2.55 +++ rpm/build/Makefile.am 21 Jun 2007 18:19:00 - 2.56 @@ -18,7 +18,7 @@ LIBS = pkgincdir = $(pkgincludedir) -pkginc_HEADERS = rpmbuild.h rpmfile.h rpmspec.h +pkginc_HEADERS = rpmbuild.h rpmspec.h noinst_HEADERS = buildio.h LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) @@ -40,13 +40,8 @@ librpmbuild_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmbuild.vers endif -rpmfile.h: - @ln -sf $(top_builddir)/file/src/file.h $@ - -files.c rpmfc.c: rpmfile.h - clean-local: - rm -f *.o rpmfile.h # .created $(FILELOBJS) + rm -f *.o # .created $(FILELOBJS) #BUILT_SOURCES = rpmbuild.lcd @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ parsePrep.c rpm/ configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 21-Jun-2007 20:58:05
Branch: HEAD Handle: 2007062119580500
Modified files:
rpm CHANGES configure.ac
rpm/build parsePrep.c
Log:
- remove support for patch-2.1.
Summary:
RevisionChanges Path
1.1389 +1 -0 rpm/CHANGES
2.75+2 -6 rpm/build/parsePrep.c
2.106 +0 -11 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1388 -r1.1389 CHANGES
--- rpm/CHANGES 21 Jun 2007 18:08:37 - 1.1388
+++ rpm/CHANGES 21 Jun 2007 18:58:05 - 1.1389
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- jbj: remove support for patch-2.1.
- rse: allow actually used tar(1) and patch(1) tools to be set via
%__tar and %__patch
- rse: add support for patch(1)'s -d option to internal macro %patch
- fray: allow -bb --short-circuit
@@ .
patch -p0 '@@ .'
Index: rpm/build/parsePrep.c
$ cvs diff -u -r2.74 -r2.75 parsePrep.c
--- rpm/build/parsePrep.c 21 Jun 2007 18:08:38 - 2.74
+++ rpm/build/parsePrep.c 21 Jun 2007 18:58:05 - 2.75
@@ -81,12 +81,8 @@
const char *patch;
*t = '\0';
-if (db) {
-#if HAVE_OLDPATCH_21 == 0
- t = stpcpy(t, -b );
-#endif
- t = stpcpy( stpcpy(t, --suffix ), db);
-}
+if (db)
+ t = stpcpy( stpcpy(t, -b --suffix ), db);
if (subdir)
t = stpcpy( stpcpy(t, -d ), subdir);
if (fuzz) {
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.105 -r2.106 configure.ac
--- rpm/configure.ac 21 Jun 2007 12:13:28 - 2.105
+++ rpm/configure.ac 21 Jun 2007 18:58:05 - 2.106
@@ -284,17 +284,6 @@
AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
AC_PATH_PROG(__PATCH, patch, %{_bindir}/patch, $MYPATH)
-AC_MSG_CHECKING(old version of patch)
-PATCHVERSION=`patch --version 21`
-
-if test $PATCHVERSION = Patch version 2.1; then
- AC_DEFINE(HAVE_OLDPATCH_21, 1,
- [Define if the patch call you'll be using is 2.1 or older])
- AC_MSG_RESULT(patch older then 2.2 found)
-else
- AC_MSG_RESULT(patch later then 2.2 found)
-fi
-
AC_PATH_PROG(__PAX, pax, %{_bindir}/pax, $MYPATH)
AC_PATH_PROG(__PERL, perl, %{_bindir}/perl, $MYPATH)
AC_PATH_PROG(__PGP, pgp, %{_bindir}/pgp, $MYPATH)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
