[CVS] RPM: rpm/ 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: 24-Jun-2007 22:39:09 Branch: HEAD Handle: 2007062421390800 Modified files: rpm Makefile.am Log: cleanup some parts of this Automake template Summary: RevisionChanges Path 2.174 +5 -3 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.173 -r2.174 Makefile.am --- rpm/Makefile.am 24 Jun 2007 18:12:30 - 2.173 +++ rpm/Makefile.am 24 Jun 2007 20:39:08 - 2.174 @@ -32,7 +32,8 @@ rpmdb \ lib \ build \ - @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ \ + @WITH_PYTHON_SUBDIR@ \ + @WITH_PERL_SUBDIR@ \ tools \ scripts \ doc \ @@ -51,6 +52,7 @@ myLDFLAGS = @WITH_LIBELF_LIB@ myLDADD = \ + $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la @@ -65,13 +67,13 @@ rpm_SOURCES =$(top_srcdir)/build.c rpm_LDFLAGS =$(myLDFLAGS) $(staticLDFLAGS) -rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD) +rpm_LDADD = rpm.o $(myLDADD) rpm.o: $(top_srcdir)/rpmqv.c $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $< rpmbuild_SOURCES = $(top_srcdir)/build.c rpmbuild_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS) -rpmbuild_LDADD = rpmbuild.o $(top_builddir)/build/librpmbuild.la $(myLDADD) +rpmbuild_LDADD = rpmbuild.o $(myLDADD) rpmbuild.o: $(top_srcdir)/rpmqv.c $(COMPILE) -DIAM_RPMBT -o $@ -c $< @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ 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: 02-Jul-2007 11:07:06 Branch: HEAD Handle: 2007070210070600 Modified files: rpm Makefile.am Log: fix 'make dist' operation by removing no longer existing files Summary: RevisionChanges Path 2.183 +2 -2 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.182 -r2.183 Makefile.am --- rpm/Makefile.am 27 Jun 2007 20:34:13 - 2.182 +++ rpm/Makefile.am 2 Jul 2007 09:07:06 - 2.183 @@ -6,9 +6,9 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - config.site db db3/configure installplatform platform* \ + db db3/configure installplatform platform* \ perl/Changes perl/MANIFEST perl/META.yml perl/Makefile.PL \ - perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in perl/README \ + perl/Makefile.PL.in perl/Makefile.am perl/README \ perl/RPM.pm perl/RPM.xs perl/foo.i386.rpm perl/hdlist-test.hdr \ perl/test-rpm-1.0-1.noarch.rpm \ perl/test-rpm-1.0-1.src.rpm \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ 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: 24-Jul-2007 10:40:55 Branch: HEAD Handle: 2007072409405500 Modified files: rpm Makefile.am Log: do not forget to distribute the lua, zlib and file subdirs in the distribution tarball Summary: RevisionChanges Path 2.199 +6 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.198 -r2.199 Makefile.am --- rpm/Makefile.am 22 Jul 2007 15:14:49 - 2.198 +++ rpm/Makefile.am 24 Jul 2007 08:40:55 - 2.199 @@ -7,6 +7,12 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ db db3/configure \ + lua/[A-Z]* lua/*.[ch] lua/local/l* \ + file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ + file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ + zlib/[A-Z]* zlib/*.[ch] zlib/autogen.sh zlib/configure.ac zlib/config.guess zlib/config.sub \ + zlib/ltmain.sh zlib/aclocal.m4 zlib/config.h.in zlib/missing zlib/install-sh zlib/depcomp \ + zlib/Makefile.in zlib/configure zlib/stamp-h.in \ perl/Changes perl/MANIFEST perl/META.yml perl/Makefile.PL \ perl/Makefile.PL.in perl/Makefile.am perl/README \ perl/RPM.pm perl/RPM.xs perl/foo.i386.rpm perl/hdlist-test.hdr \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ 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: 25-Jul-2007 08:14:34 Branch: HEAD Handle: 2007072507143400 Modified files: rpm Makefile.am Log: the $< source specifier can be used reliably only in generic '.x.y:' rules/targets, not in regular rules/targets. At least AIX /usr/bin/make dislikes it, so replace with the source itself Summary: RevisionChanges Path 2.200 +2 -2 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.199 -r2.200 Makefile.am --- rpm/Makefile.am 24 Jul 2007 08:40:55 - 2.199 +++ rpm/Makefile.am 25 Jul 2007 06:14:34 - 2.200 @@ -92,13 +92,13 @@ rpm_LDFLAGS =@LDFLAGS_STATIC@ rpm_LDADD = rpm.o $(myLDADD) rpm.o: $(top_srcdir)/rpmqv.c - $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $< + $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c rpmbuild_SOURCES = $(top_srcdir)/build.c rpmbuild_LDFLAGS = @LDFLAGS_STATIC@ rpmbuild_LDADD = rpmbuild.o $(myLDADD) rpmbuild.o: $(top_srcdir)/rpmqv.c - $(COMPILE) -DIAM_RPMBT -o $@ -c $< + $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c .PHONY: splint splint: @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
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: 26-Jul-2007 14:58:44 Branch: HEAD Handle: 2007072613584400 Modified files: rpm Makefile.am Log: install(1) and mkdir -p are widely available these days. Summary: RevisionChanges Path 2.201 +0 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.200 -r2.201 Makefile.am --- rpm/Makefile.am 25 Jul 2007 06:14:34 - 2.200 +++ rpm/Makefile.am 26 Jul 2007 12:58:44 - 2.201 @@ -84,7 +84,6 @@ pkglibdir = @USRLIBRPM@ pkglib_DATA =rpmpopt macros -pkglib_SCRIPTS = install-sh mkinstalldirs noinst_HEADERS = build.h debug.h system.h @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
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: 26-Jul-2007 16:31:58 Branch: HEAD Handle: 2007072615315800 Modified files: rpm Makefile.am Log: revert, uglix still can't get install(1) and mkdir -p deployed universally. Summary: RevisionChanges Path 2.202 +1 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.201 -r2.202 Makefile.am --- rpm/Makefile.am 26 Jul 2007 12:58:44 - 2.201 +++ rpm/Makefile.am 26 Jul 2007 14:31:58 - 2.202 @@ -84,6 +84,7 @@ pkglibdir = @USRLIBRPM@ pkglib_DATA =rpmpopt macros +pkglib_SCRIPTS = install-sh mkinstalldirs noinst_HEADERS = build.h debug.h system.h @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ 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: 28-Jul-2007 09:01:34 Branch: HEAD Handle: 2007072808013400 Modified files: rpm Makefile.am Log: perl/Makefile.PL is gone Summary: RevisionChanges Path 2.203 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.202 -r2.203 Makefile.am --- rpm/Makefile.am 26 Jul 2007 14:31:58 - 2.202 +++ rpm/Makefile.am 28 Jul 2007 07:01:34 - 2.203 @@ -13,7 +13,7 @@ zlib/[A-Z]* zlib/*.[ch] zlib/autogen.sh zlib/configure.ac zlib/config.guess zlib/config.sub \ zlib/ltmain.sh zlib/aclocal.m4 zlib/config.h.in zlib/missing zlib/install-sh zlib/depcomp \ zlib/Makefile.in zlib/configure zlib/stamp-h.in \ - perl/Changes perl/MANIFEST perl/META.yml perl/Makefile.PL \ + perl/Changes perl/MANIFEST perl/META.yml \ perl/Makefile.PL.in perl/Makefile.am perl/README \ perl/RPM.pm perl/RPM.xs perl/foo.i386.rpm perl/hdlist-test.hdr \ perl/test-rpm-1.0-1.noarch.rpm \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ 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: 06-Aug-2007 14:45:22 Branch: HEAD Handle: 2007080613452200 Modified files: rpm Makefile.am Log: fix tarball rolling via 'make dist' again Summary: RevisionChanges Path 2.205 +7 -7 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.204 -r2.205 Makefile.am --- rpm/Makefile.am 6 Aug 2007 11:52:59 - 2.204 +++ rpm/Makefile.am 6 Aug 2007 12:45:22 - 2.205 @@ -13,13 +13,13 @@ zlib/[A-Z]* zlib/*.[ch] zlib/autogen.sh zlib/configure.ac zlib/config.guess zlib/config.sub \ zlib/ltmain.sh zlib/aclocal.m4 zlib/config.h.in zlib/missing zlib/install-sh zlib/depcomp \ zlib/Makefile.in zlib/configure zlib/stamp-h.in \ - perl/Changes perl/MANIFEST perl/META.yml \ - perl/Makefile.PL.in perl/Makefile.am perl/README \ - perl/RPM.pm perl/RPM.xs perl/foo.i386.rpm perl/hdlist-test.hdr \ - perl/test-rpm-1.0-1.noarch.rpm \ - perl/test-rpm-1.0-1.src.rpm \ - perl/test.pl \ - perl/typemap \ + perl/MANIFEST perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \ + perl/README perl/RPM.pm perl/RPM.xs perl/RPM/Constant.pm perl/RPM/Header.pm \ + perl/RPM/PackageIterator.pm perl/RPM/Transaction.pm perl/RPM_Constant.xs perl/RPM_Header.xs \ + perl/RPM_PackageIterator.xs perl/RPM_Transaction.xs perl/foo.i386.rpm perl/hdlist-test.hdr \ + perl/rpmxs.c perl/rpmxs.h perl/t/00.pod.coverage.t perl/t/00.pod.t perl/t/01.rpm.t \ + perl/t/02.rpmconstant.t perl/t/03.header.t perl/t/04.transaction.t perl/t/05.packageiterator.t \ + perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm perl/test.pl perl/typemap \ pubkeys/JBJ-GPG-KEY \ po/*.in po/*.po po/rpm.pot \ rpm.magic rpmqv.c \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ 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: 06-Aug-2007 14:51:06 Branch: HEAD Handle: 2007080613510600 Modified files: rpm Makefile.am Log: MANIFEST is no longer there Summary: RevisionChanges Path 2.206 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.205 -r2.206 Makefile.am --- rpm/Makefile.am 6 Aug 2007 12:45:22 - 2.205 +++ rpm/Makefile.am 6 Aug 2007 12:51:06 - 2.206 @@ -13,7 +13,7 @@ zlib/[A-Z]* zlib/*.[ch] zlib/autogen.sh zlib/configure.ac zlib/config.guess zlib/config.sub \ zlib/ltmain.sh zlib/aclocal.m4 zlib/config.h.in zlib/missing zlib/install-sh zlib/depcomp \ zlib/Makefile.in zlib/configure zlib/stamp-h.in \ - perl/MANIFEST perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \ + perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \ perl/README perl/RPM.pm perl/RPM.xs perl/RPM/Constant.pm perl/RPM/Header.pm \ perl/RPM/PackageIterator.pm perl/RPM/Transaction.pm perl/RPM_Constant.xs perl/RPM_Header.xs \ perl/RPM_PackageIterator.xs perl/RPM_Transaction.xs perl/foo.i386.rpm perl/hdlist-test.hdr \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Bernhard Rosenkraenzer
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 12-Oct-2007 19:59:51
Branch: HEAD Handle: 2007101218595000
Modified files:
rpm Makefile.am
Log:
Create RPMS/pentium{3,4} directories
Submitted by: bero
Summary:
RevisionChanges Path
2.209 +3 -1 rpm/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.208 -r2.209 Makefile.am
--- rpm/Makefile.am 7 Aug 2007 00:09:58 - 2.208
+++ rpm/Makefile.am 12 Oct 2007 17:59:50 - 2.209
@@ -146,7 +146,9 @@
$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i486 ;\
$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i586 ;\
$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\
- $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;;\
+ $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\
+ $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium3 ;\
+ $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium4 ;;\
armv3l) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv3l ;;\
armv4b) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv4b ;;\
armv4l) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv3l ;\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ 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: 11-Nov-2007 17:13:36 Branch: HEAD Handle: 200716133600 Modified files: rpm Makefile.am Log: add xar/ to tarballs Summary: RevisionChanges Path 2.211 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.210 -r2.211 Makefile.am --- rpm/Makefile.am 11 Nov 2007 15:05:17 - 2.210 +++ rpm/Makefile.am 11 Nov 2007 16:13:36 - 2.211 @@ -6,7 +6,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - db db3/configure \ + db db3/configure xar \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 20-May-2008 11:17:42 Branch: HEAD Handle: 2008052009174100 Modified files: rpm Makefile.am Log: internal lzma dir/flags were missing Summary: RevisionChanges Path 2.218 +3 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.217 -r2.218 Makefile.am --- rpm/Makefile.am 7 May 2008 16:58:24 - 2.217 +++ rpm/Makefile.am 20 May 2008 09:17:41 - 2.218 @@ -48,6 +48,7 @@ @WITH_LUA_SUBDIR@ \ @WITH_FILE_SUBDIR@ \ @WITH_XAR_SUBDIR@ \ + @WITH_LZMA_SUBDIR@ \ misc \ rpmio \ rpmdb \ @@ -75,7 +76,8 @@ @WITH_ZLIB_CPPFLAGS@ \ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ \ - @WITH_XAR_CPPFLAGS@ + @WITH_XAR_CPPFLAGS@ \ + @WITH_LZMA_CPPFLAGS@ myLDADD = \ $(top_builddir)/build/librpmbuild.la \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
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: 20-May-2008 19:46:24 Branch: HEAD Handle: 2008052017462400 Modified files: rpm Makefile.am Log: - jbj: add lazy mkdir & version to lcov-upload target. Summary: RevisionChanges Path 2.219 +3 -2 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.218 -r2.219 Makefile.am --- rpm/Makefile.am 20 May 2008 09:17:41 - 2.218 +++ rpm/Makefile.am 20 May 2008 17:46:24 - 2.219 @@ -57,9 +57,9 @@ rpmconstant \ @WITH_PYTHON_SUBDIR@ \ @WITH_PERL_SUBDIR@ \ - tests \ tools \ scripts \ + tests \ doc \ . @@ -253,7 +253,8 @@ .PHONY: lcov-upload lcov-upload: lcov - tar -C lcov -cf - . | (cd /var/ftp/pub/jbj/rpm-lcov; tar xf -) + mkdir -p /var/ftp/pub/jbj/rpm-$(VERSION)-lcov + tar -C lcov -cf - . | (cd /var/ftp/pub/jbj/rpm-$(VERSION)-lcov; tar xf -) #rsync -rvz -e ssh --delete lcov/* ??? cscope: @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Ãyvind Karlsen Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 15-Jul-2008 17:52:18 Branch: HEAD Handle: 2008071515521800 Modified files: rpm Makefile.am Log: add missing test-rpm.spec Summary: RevisionChanges Path 2.220 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.219 -r2.220 Makefile.am --- rpm/Makefile.am 20 May 2008 17:46:24 - 2.219 +++ rpm/Makefile.am 15 Jul 2008 15:52:18 - 2.220 @@ -26,7 +26,7 @@ perl/RPM_Files.xs perl/RPM/Files.pm perl/t/07.files.t \ perl/RPM_Dependencies.xs perl/RPM/Dependencies.pm perl/t/08.dependencies.t \ perl/RPM_Spec.xs perl/RPM/Spec.pm perl/t/09.spec.t \ - perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm \ + perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm test-rpm.spec\ perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \ perl/README \ pubkeys/JBJ-GPG-KEY \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Ãyvind Karlsen Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 15-Jul-2008 17:57:33 Branch: HEAD Handle: 2008071515573300 Modified files: rpm Makefile.am Log: bah, fix path Summary: RevisionChanges Path 2.221 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.220 -r2.221 Makefile.am --- rpm/Makefile.am 15 Jul 2008 15:52:18 - 2.220 +++ rpm/Makefile.am 15 Jul 2008 15:57:33 - 2.221 @@ -26,7 +26,7 @@ perl/RPM_Files.xs perl/RPM/Files.pm perl/t/07.files.t \ perl/RPM_Dependencies.xs perl/RPM/Dependencies.pm perl/t/08.dependencies.t \ perl/RPM_Spec.xs perl/RPM/Spec.pm perl/t/09.spec.t \ - perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm test-rpm.spec\ + perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm perl/test-rpm.spec \ perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \ perl/README \ pubkeys/JBJ-GPG-KEY \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Mar-2009 14:49:34 Branch: HEAD Handle: 2009030713493400 Modified files: rpm Makefile.am Log: try to fix RPM 5.2 snapshot tarballs Summary: RevisionChanges Path 2.227 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.226 -r2.227 Makefile.am --- rpm/Makefile.am 15 Feb 2009 13:55:30 - 2.226 +++ rpm/Makefile.am 7 Mar 2009 13:49:34 - 2.227 @@ -6,7 +6,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - db db3/configure xar \ + db db3/configure xar xz pcre \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 20:37:28 Branch: HEAD Handle: 2009041318372800 Modified files: rpm Makefile.am Log: fix tarball creation Summary: RevisionChanges Path 2.231 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.230 -r2.231 Makefile.am --- rpm/Makefile.am 13 Apr 2009 18:31:52 - 2.230 +++ rpm/Makefile.am 13 Apr 2009 18:37:28 - 2.231 @@ -6,7 +6,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - db db3/configure xar xz pcre \ + db db3/configure xar xz pcre syck \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Ãyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 06-May-2009 13:44:32 Branch: HEAD Handle: 2009050611443200 Modified files: rpm Makefile.am Log: be sure to include cpuinfo.yaml when generating tarball Summary: RevisionChanges Path 2.236 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.235 -r2.236 Makefile.am --- rpm/Makefile.am 6 May 2009 02:26:10 - 2.235 +++ rpm/Makefile.am 6 May 2009 11:44:32 - 2.236 @@ -4,7 +4,7 @@ LINT = splint -EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \ +EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL cpuinfo.yaml \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ db db3/configure xar xz pcre syck \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 25-Sep-2009 12:16:31 Branch: HEAD Handle: 2009092510163100 Modified files: rpm Makefile.am Log: add INSTALL.developer in automake dist rule that i Summary: RevisionChanges Path 2.245 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.244 -r2.245 Makefile.am --- rpm/Makefile.am 23 Aug 2009 19:25:36 - 2.244 +++ rpm/Makefile.am 25 Sep 2009 10:16:31 - 2.245 @@ -5,7 +5,7 @@ LINT = splint MCCABE = pmccabe -EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL cpuinfo.yaml \ +EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL INSTALL.developer cpuinfo.yaml \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ db db3/configure xar xz pcre syck \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 26-Dec-2009 17:29:02 Branch: HEAD Handle: 2009122616290200 Modified files: rpm Makefile.am Log: - distcheck: include all mandatory subdir checkouts. more todo++. Summary: RevisionChanges Path 2.247 +2 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.246 -r2.247 Makefile.am --- rpm/Makefile.am 18 Dec 2009 00:42:52 - 2.246 +++ rpm/Makefile.am 26 Dec 2009 16:29:02 - 2.247 @@ -7,7 +7,8 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL INSTALL.developer cpuinfo.yaml \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - db db3/configure xar xz pcre syck \ + db xar xz pcre syck js rc \ + db3/configure \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Ãyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 07-May-2010 20:30:53 Branch: HEAD Handle: 2010050718305300 Modified files: rpm Makefile.am Log: add ruby files to generated tarball Summary: RevisionChanges Path 2.249 +1 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.248 -r2.249 Makefile.am --- rpm/Makefile.am 27 Apr 2010 18:29:42 - 2.248 +++ rpm/Makefile.am 7 May 2010 18:30:53 - 2.249 @@ -12,6 +12,7 @@ lua/[A-Z]* lua/*.[ch] lua/local/l* \ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* \ + ruby/*.[ch] ruby/Makefile.in ruby/Makefile.am \ macros/*.in \ perl/typemap \ perl/Makefile.PL.in \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 25-Jun-2010 19:20:57 Branch: HEAD Handle: 2010062517205600 Modified files: rpm Makefile.am Log: generate po/LINGUAS by make updatepo Summary: RevisionChanges Path 2.250 +3 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.249 -r2.250 Makefile.am --- rpm/Makefile.am 7 May 2010 18:30:53 - 2.249 +++ rpm/Makefile.am 25 Jun 2010 17:20:56 - 2.250 @@ -178,6 +178,9 @@ .PHONY: updatepo updatepo: rsync -Lrtvz translationproject.org::tp/latest/rpm/ po + po_dir=./po + LANG=C + ls "$po_dir"/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > $po_dir/LINGUAS CVSTAG = r$(subst .,-,$(VERSION)) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Sep-2010 23:54:34
Branch: HEAD Handle: 2010092121543400
Modified files:
rpm Makefile.am
Log:
- fix: updatepo target.
Summary:
RevisionChanges Path
2.252 +2 -2 rpm/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.251 -r2.252 Makefile.am
--- rpm/Makefile.am 23 Aug 2010 17:59:32 - 2.251
+++ rpm/Makefile.am 21 Sep 2010 21:54:34 - 2.252
@@ -177,12 +177,12 @@
`make -s sources -C rpmdb` \
`make -s sources -C rpmio` | sort -nr | head -n 30
+po_dir=./po
.PHONY: updatepo
updatepo:
rsync -Lrtvz translationproject.org::tp/latest/rpm/ po
- po_dir=./po
LANG=C
- ls "$po_dir"/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' >
$po_dir/LINGUAS
+ ls ${po_dir}/*.po 2>/dev/null | sed 's|.*/||; s|\.po$$||' >
${po_dir}/LINGUAS
CVSTAG = r$(subst .,-,$(VERSION))
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Sep-2010 23:32:30
Branch: HEAD Handle: 2010092721322900
Modified files:
rpm Makefile.am
Log:
- autofu: handle po subdir correctly.
Summary:
RevisionChanges Path
2.253 +5 -6 rpm/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.252 -r2.253 Makefile.am
--- rpm/Makefile.am 21 Sep 2010 21:54:34 - 2.252
+++ rpm/Makefile.am 27 Sep 2010 21:32:29 - 2.253
@@ -5,13 +5,15 @@
LINT = splint
MCCABE = pmccabe
+# xar xz
+# file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]*
+# file/acinclude.m4 file/aclocal.m4 file/autogen.sh file/config*
+#
EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL INSTALL.developer
cpuinfo.yaml \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
- db xar xz pcre syck js \
+ db pcre syck js \
db3/configure \
lua/[A-Z]* lua/*.[ch] lua/local/l* \
- file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc
file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \
- file/autogen.sh file/config* \
ruby/*.[ch] ruby/Makefile.in ruby/Makefile.am \
macros/*.in \
perl/typemap \
@@ -177,12 +179,9 @@
`make -s sources -C rpmdb` \
`make -s sources -C rpmio` | sort -nr | head -n 30
-po_dir=./po
.PHONY: updatepo
updatepo:
rsync -Lrtvz translationproject.org::tp/latest/rpm/ po
- LANG=C
- ls ${po_dir}/*.po 2>/dev/null | sed 's|.*/||; s|\.po$$||' >
${po_dir}/LINGUAS
CVSTAG = r$(subst .,-,$(VERSION))
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 09-Oct-2010 21:33:10 Branch: HEAD Handle: 2010100919331000 Modified files: rpm Makefile.am Log: - tests: run after rpm is built, there are Makefile.am rules that need rpm. Summary: RevisionChanges Path 2.255 +2 -2 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.254 -r2.255 Makefile.am --- rpm/Makefile.am 9 Oct 2010 03:27:17 - 2.254 +++ rpm/Makefile.am 9 Oct 2010 19:33:10 - 2.255 @@ -85,9 +85,9 @@ @WITH_PERL_SUBDIR@ \ tools \ scripts \ - tests \ doc \ - . + . \ + tests AM_CPPFLAGS = \ -I$(srcdir) \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 02-Dec-2010 15:11:47 Branch: HEAD Handle: 2010120214114700 Modified files: rpm Makefile.am Log: - re-add arbitrarytag test package. Summary: RevisionChanges Path 2.263 +1 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.262 -r2.263 Makefile.am --- rpm/Makefile.am 1 Dec 2010 15:00:40 - 2.262 +++ rpm/Makefile.am 2 Dec 2010 14:11:47 - 2.263 @@ -16,6 +16,7 @@ pubkeys/JBJ-GPG-KEY \ rpm.magic rpmqv.c \ python \ + tests/arbitrarytag-1.0-1.src.rpm \ tests/cudf-test-1-0.src.rpm \ tests/devtool-sanity-1.0-1.src.rpm \ tests/edos-test-1-0.src.rpm \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Ãyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 25-Jan-2011 15:41:47 Branch: HEAD Handle: 2011012514414700 Modified files: rpm Makefile.am Log: add missing file required by test suite to generated tarball Summary: RevisionChanges Path 2.264 +1 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.263 -r2.264 Makefile.am --- rpm/Makefile.am 2 Dec 2010 14:11:47 - 2.263 +++ rpm/Makefile.am 25 Jan 2011 14:41:47 - 2.264 @@ -21,6 +21,7 @@ tests/devtool-sanity-1.0-1.src.rpm \ tests/edos-test-1-0.src.rpm \ tests/probes-test-1-0.src.rpm \ + tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm \ tests/triggers-D-1.0-1.src.rpm \ tests/triggers-DP-1.0-1.src.rpm \ tests/triggers-F-1.0-1.src.rpm \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am 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: 19-Jun-2007 16:48:19 Branch: HEAD Handle: 2007061915481900 Modified files: rpm Makefile.am configure.ac Log: the variable LIBMISC is never actually set to a value in this build environment so nuke it Summary: RevisionChanges Path 2.169 +1 -2 rpm/Makefile.am 2.92+0 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.168 -r2.169 Makefile.am --- rpm/Makefile.am 19 Jun 2007 12:46:26 - 2.168 +++ rpm/Makefile.am 19 Jun 2007 14:48:19 - 2.169 @@ -40,8 +40,7 @@ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ @WITH_POPT_LIB@ \ - @WITH_ZLIB_LIB@ \ - @LIBMISC@ + @WITH_ZLIB_LIB@ bin_PROGRAMS = rpm rpmbuild @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.91 -r2.92 configure.ac --- rpm/configure.ac 19 Jun 2007 14:45:36 - 2.91 +++ rpm/configure.ac 19 Jun 2007 14:48:19 - 2.92 @@ -1418,8 +1418,6 @@ AC_SUBST(testdir) AC_SUBST(INCPATH) -AC_SUBST(LIBMISC) - AC_SUBST(RPM) AC_CONFIG_SUBDIRS(popt zlib file sqlite db3) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am 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: 20-Jun-2007 18:50:21 Branch: HEAD Handle: 2007062017502000 Modified files: rpm Makefile.am configure.ac Log: move the remaining -fpie stuff also to configure.ac and under the Linux section for now Summary: RevisionChanges Path 2.170 +2 -2 rpm/Makefile.am 2.96+1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.169 -r2.170 Makefile.am --- rpm/Makefile.am 19 Jun 2007 14:48:19 - 2.169 +++ rpm/Makefile.am 20 Jun 2007 16:50:20 - 2.170 @@ -54,13 +54,13 @@ rpm_LDFLAGS =$(myLDFLAGS) $(staticLDFLAGS) rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD) rpm.o: $(top_srcdir)/rpmqv.c - $(COMPILE) -fpie -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $< + $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $< rpmbuild_SOURCES = $(top_srcdir)/build.c rpmbuild_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS) rpmbuild_LDADD = rpmbuild.o $(top_builddir)/build/librpmbuild.la $(myLDADD) rpmbuild.o: $(top_srcdir)/rpmqv.c - $(COMPILE) -fpie -DIAM_RPMBT -o $@ -c $< + $(COMPILE) -DIAM_RPMBT -o $@ -c $< $(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@ @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.95 -r2.96 configure.ac --- rpm/configure.ac 20 Jun 2007 10:22:46 - 2.95 +++ rpm/configure.ac 20 Jun 2007 16:50:20 - 2.96 @@ -39,7 +39,7 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT" CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts" case "$target" in -*-*-linux* ) LDFLAGS="$LDFLAGS -pie" ;; +*-*-linux* ) CFLAGS="$CFLAGS -fpie"; LDFLAGS="$LDFLAGS -pie" ;; esac fi export CFLAGS LDFLAGS @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 20-Jun-2007 23:42:24 Branch: HEAD Handle: 2007062022422400 Modified files: rpm Makefile.am configure.ac Log: po/ and m4/ really shouldn't be here. gettextize adds these. Summary: RevisionChanges Path 2.172 +1 -1 rpm/Makefile.am 2.99+1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.171 -r2.172 Makefile.am --- rpm/Makefile.am 20 Jun 2007 21:10:19 - 2.171 +++ rpm/Makefile.am 20 Jun 2007 21:42:24 - 2.172 @@ -4,7 +4,7 @@ LINT = splint -EXTRA_DIST = m4/ChangeLog config.rpath m4/ChangeLog CHANGES CREDITS Doxyheader GROUPS INSTALL \ +EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ config.site db db3/configure installplatform platform* \ perl/Changes perl/MANIFEST perl/META.yml perl/Makefile.PL \ @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.98 -r2.99 configure.ac --- rpm/configure.ac 20 Jun 2007 21:21:18 - 2.98 +++ rpm/configure.ac 20 Jun 2007 21:42:24 - 2.99 @@ -1295,7 +1295,7 @@ AC_CONFIG_SUBDIRS() -AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec po/Makefile.in +AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile scripts/Makefile scripts/macros.perl scripts/macros.php scripts/macros.python @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am 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: 26-Jun-2007 21:21:13 Branch: HEAD Handle: 2007062620211300 Modified files: rpm Makefile.am configure.ac Log: there is no need for an internal Neon (no modifications necessary) and RPM should be able to (hopefully) build without zlib, too. BeeCrypt is external already external only, so remove glue code Summary: RevisionChanges Path 2.178 +0 -2 rpm/Makefile.am 2.142 +7 -12 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.177 -r2.178 Makefile.am --- rpm/Makefile.am 26 Jun 2007 18:19:08 - 2.177 +++ rpm/Makefile.am 26 Jun 2007 19:21:13 - 2.178 @@ -25,8 +25,6 @@ @WITH_ZLIB_SUBDIR@ \ @WITH_LUA_SUBDIR@ \ @WITH_FILE_SUBDIR@ \ - @WITH_NEON_SUBDIR@ \ - @WITH_BEECRYPT_SUBDIR@ \ rpmio \ rpmdb \ lib \ @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.141 -r2.142 configure.ac --- rpm/configure.ac 26 Jun 2007 18:47:21 - 2.141 +++ rpm/configure.ac 26 Jun 2007 19:21:13 - 2.142 @@ -688,7 +688,7 @@ RPM_CHECK_LIB( [ZLib], [zlib], [z gz], [gzread], [zlib.h], -[yes,internal], [zlib], +[yes,internal:none], [zlib], [ AC_CHECK_FUNC(gzseek) if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have ]) @@ -713,18 +713,13 @@ RPM_CHECK_LIB( [Neon], [neon], [neon], [ne_session_create], [ne_session.h], -[yes,external:internal], [neon:src:src], -[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then +[yes,external], [], +[ AC_CHECK_LIB(neon, ne_get_response_header, [ AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, -[Define to 1 if you have ne_get_response_header() in libneon.]) - else - AC_CHECK_LIB(neon, ne_get_response_header, [ - AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, -[Define to 1 if you have ne_get_response_header() in libneon.]) ]) - AC_CHECK_LIB(neon, ne_send_request_chunk, [ - AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, -[Define to 1 if you have ne_send_request_chunk() in libneon.]) ]) - fi +[Define to 1 if you have ne_get_response_header() in libneon.]) ]) + AC_CHECK_LIB(neon, ne_send_request_chunk, [ + AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, +[Define to 1 if you have ne_send_request_chunk() in libneon.]) ]) ], [ AC_ERROR([mandatory Neon library not found]) ]) dnl # File (magic) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am macros.in
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: 22-Jul-2007 17:14:49
Branch: HEAD Handle: 2007072216144900
Modified files:
rpm Makefile.am macros.in
Log:
place the 'transactional rollback' directory not inside the RPMS dir
as its binary RPMS are really special ones. Instead place it into a
sibling directory to more clearly separate it.
Summary:
RevisionChanges Path
2.198 +1 -2 rpm/Makefile.am
1.189 +4 -4 rpm/macros.in
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.197 -r2.198 Makefile.am
--- rpm/Makefile.am 21 Jul 2007 19:30:28 - 2.197
+++ rpm/Makefile.am 22 Jul 2007 15:14:49 - 2.198
@@ -123,7 +123,7 @@
install-data-local:
@$(mkinstalldirs) $(DESTDIR)$(DBPATH)
- @for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
+ @for dir in BUILD RPMS SOURCES SPECS SRPMS TR; do\
$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
done
@case "@host_cpu@" in \
@@ -160,7 +160,6 @@
*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/@host_cpu@ ;;\
esac
$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/noarch
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/repackage
.PHONY: setperms
setperms:
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
$ cvs diff -u -r1.188 -r1.189 macros.in
--- rpm/macros.in 22 Jul 2007 11:36:13 - 1.188
+++ rpm/macros.in 22 Jul 2007 15:14:49 - 1.189
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.188 2007/07/22 11:36:13 rse Exp $
+# $Id: macros.in,v 1.189 2007/07/22 15:14:49 rse Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -842,9 +842,9 @@
# XXXNote: escaped %% for use in headerSprintf()
%_repackage_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-#The directory in which erased packages will be saved when using
-#the --repackage option.
-%_repackage_dir %{_rpmdir}/repackage
+#The "transactional rollback" directory in which erased packages will
+#be saved when using the --repackage option.
+%_repackage_dir %{_topdir}/TR
#A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
%_repackage_root %{nil}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am macros.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 15-Nov-2007 12:39:37
Branch: HEAD Handle: 2007111511393700
Modified files:
rpm Makefile.am macros.in
Log:
move _repackage_dir, away from %{_topdir} back to %{_var}
Summary:
RevisionChanges Path
2.212 +4 -1 rpm/Makefile.am
1.199 +2 -2 rpm/macros.in
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.211 -r2.212 Makefile.am
--- rpm/Makefile.am 11 Nov 2007 16:13:36 - 2.211
+++ rpm/Makefile.am 15 Nov 2007 11:39:37 - 2.212
@@ -140,7 +140,8 @@
install-data-local:
@$(MKDIR_P) $(DESTDIR)$(DBPATH)
- @for dir in BUILD RPMS SOURCES SPECS SRPMS TR; do\
+ @$(MKDIR_P) $(DESTDIR)$(varprefix)/spool/repackage
+ @for dir in BUILD RPMS SOURCES SPECS SRPMS; do\
$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/$$dir;\
done
@case "@host_cpu@" in \
@@ -194,9 +195,11 @@
done
@$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
@$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/rpm
+ @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP}
$(DESTDIR)$(varprefix)/spool/repackage
[EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/[A-Z]*
[EMAIL PROTECTED](__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/rpm
[EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/__db.*
+ [EMAIL PROTECTED](__CHMOD) 0755 $(DESTDIR)$(varprefix)/spool/repackage
.PHONY: unsetgid
unsetgid:
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
$ cvs diff -u -r1.198 -r1.199 macros.in
--- rpm/macros.in 13 Oct 2007 14:58:21 - 1.198
+++ rpm/macros.in 15 Nov 2007 11:39:37 - 1.199
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.198 2007/10/13 14:58:21 bero Exp $
+# $Id: macros.in,v 1.199 2007/11/15 11:39:37 afb Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -857,7 +857,7 @@
#The "transactional rollback" directory in which erased packages will
#be saved when using the --repackage option.
-%_repackage_dir %{_topdir}/TR
+%_repackage_dir %{_var}/spool/repackage
#A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
%_repackage_root %{nil}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 02-Nov-2010 16:57:11 Branch: HEAD Handle: 2010110215571000 Modified files: rpm Makefile.am configure.ac Log: - ruby: stub-out WITH_RUBY_CPPFLAGS and WITH_RUBY_VENDORARCHDIR for now. - autofu: sync with rpm-5_3. Summary: RevisionChanges Path 2.261 +10 -37 rpm/Makefile.am 2.470 +17 -26 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.260 -r2.261 Makefile.am --- rpm/Makefile.am 18 Oct 2010 04:21:17 - 2.260 +++ rpm/Makefile.am 2 Nov 2010 15:57:10 - 2.261 @@ -1,47 +1,22 @@ # Top level Makefile for rpm AUTOMAKE_OPTIONS = 1.4 foreign +ACLOCAL_AMFLAGS = -I m4 LINT = splint MCCABE = pmccabe -# xar xz -# file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* -# file/acinclude.m4 file/aclocal.m4 file/autogen.sh file/config* -# EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL INSTALL.developer cpuinfo.yaml \ - autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - pcre syck js \ - lua/[A-Z]* lua/*.[ch] lua/local/l* \ - ruby/*.[ch] ruby/Makefile.in ruby/Makefile.am \ - macros/*.in \ - perl/typemap \ - perl/Makefile.PL.in \ - perl/t/00.pod.t perl/t/00.pod.coverage.t \ - perl/rpmxs.c perl/rpmxs.h \ - perl/RPM.xs perl/RPM.pm perl/t/01.rpm.t \ - perl/RPM/Constant.pm perl/RPM_Constant.xs perl/t/02.rpmconstant.t \ - perl/RPM_Header.xs perl/RPM/Header.pm perl/t/03.header.t \ - perl/RPM_Transaction.xs perl/RPM/Transaction.pm perl/t/04.transaction.t \ - perl/RPM_PackageIterator.xs perl/RPM/PackageIterator.pm perl/t/05.packageiterator.t \ - perl/RPM_Problems.xs perl/RPM/Problems.pm perl/t/06.problems.t \ - perl/RPM_Files.xs perl/RPM/Files.pm perl/t/07.files.t \ - perl/RPM_Dependencies.xs perl/RPM/Dependencies.pm perl/t/08.dependencies.t \ - perl/RPM_Spec.xs perl/RPM/Spec.pm perl/t/09.spec.t \ - perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm perl/test-rpm.spec \ - perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \ - perl/README \ + autodeps autogen.sh \ + syck js \ + lua \ + ruby \ + macros \ + perl \ pubkeys/JBJ-GPG-KEY \ - po/*.in po/*.po po/rpm.pot \ rpm.magic rpmqv.c \ - python/mpw/Makefile.am python/mpw/test/* python/test/resources/* python/test/dscmp \ - python/test/psTest.py python/test/testhdr python/test/testit python/test/testmi \ - python/test/testrollback.py python/test/dsMerge.py python/test/test_rpm.py \ - python/rpm/__init__.py python/[a-z]* python/Makefile.in python/Makefile.am \ - rpmio/auto/*.in \ - rpmdb/auto/*.in \ - lib/auto/*.in \ - build/auto/*.in \ + python \ + tests/arbitrarytag-1.0-1.src.rpm \ tests/cudf-test-1-0.src.rpm \ tests/devtool-sanity-1.0-1.src.rpm \ tests/edos-test-1-0.src.rpm \ @@ -61,9 +36,9 @@ endif SUBDIRS += \ @WITH_DB_SUBDIR@ \ - @WITH_POPT_SUBDIR@ \ @WITH_ZLIB_SUBDIR@ \ @WITH_PCRE_SUBDIR@ \ + @WITH_POPT_SUBDIR@ \ @WITH_LUA_SUBDIR@ \ @WITH_BEECRYPT_SUBDIR@ \ @WITH_NEON_SUBDIR@ \ @@ -308,5 +283,3 @@ cscope -b -R cref: ctags cscope - -ACLOCAL_AMFLAGS = -I m4 @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.469 -r2.470 configure.ac --- rpm/configure.ac 27 Oct 2010 00:58:01 - 2.469 +++ rpm/configure.ac 2 Nov 2010 15:57:10 - 2.470 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2009" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.5.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2010-09-18" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ -96,7 +96,6 @@ AC_SUBST([RPM_TIMESTAMP]) AC_SUBST([RPM_VENDOR]) - dnl ## dnl ## TOOL-CHAIN CHECKS dnl ## @@ -156,7 +155,7 @@ if test ".$enableval" = .yes; then if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then dn
[CVS] RPM: rpm/ Makefile.am configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 01-Dec-2010 16:00:46 Branch: HEAD Handle: 2010120115003802 Modified files: rpm Makefile.am configure.ac Log: - typo in version, don't add arbitrarytag*.src.rpm yet. Summary: RevisionChanges Path 2.262 +0 -1 rpm/Makefile.am 2.471 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.261 -r2.262 Makefile.am --- rpm/Makefile.am 2 Nov 2010 15:57:10 - 2.261 +++ rpm/Makefile.am 1 Dec 2010 15:00:40 - 2.262 @@ -16,7 +16,6 @@ pubkeys/JBJ-GPG-KEY \ rpm.magic rpmqv.c \ python \ - tests/arbitrarytag-1.0-1.src.rpm \ tests/cudf-test-1-0.src.rpm \ tests/devtool-sanity-1.0-1.src.rpm \ tests/edos-test-1-0.src.rpm \ @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.470 -r2.471 configure.ac --- rpm/configure.ac 2 Nov 2010 15:57:10 - 2.470 +++ rpm/configure.ac 1 Dec 2010 15:00:38 - 2.471 @@ -8,7 +8,7 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.5.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) +AC_INIT([rpm],[5.4.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) PACKAGE_TIMESTAMP="2010-09-18" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am autogen.sh 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: 27-Jun-2007 12:04:35 Branch: HEAD Handle: 2007062711043300 Modified files: rpm Makefile.am autogen.sh configure.ac Log: finally make 'automake -Wall' happy by not overriding its 'ctags' target and the CTAGS variable (same for CSCOPE) Summary: RevisionChanges Path 2.180 +1 -4 rpm/Makefile.am 2.81+1 -1 rpm/autogen.sh 2.145 +0 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.179 -r2.180 Makefile.am --- rpm/Makefile.am 27 Jun 2007 09:45:14 - 2.179 +++ rpm/Makefile.am 27 Jun 2007 10:04:33 - 2.180 @@ -204,11 +204,8 @@ mkdir -p $@ - [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@ -ctags: - find . -type f -name "*.[ch]*" | xargs @CTAGS@ - cscope: - @CSCOPE@ -b -R + cscope -b -R cref: ctags cscope @@ . patch -p0 <<'@@ .' Index: rpm/autogen.sh $ cvs diff -u -r2.80 -r2.81 autogen.sh --- rpm/autogen.sh26 Jun 2007 18:49:03 - 2.80 +++ rpm/autogen.sh27 Jun 2007 10:04:33 - 2.81 @@ -48,7 +48,7 @@ aclocal -I m4 autoheader echo "---> generate files via GNU automake (automake)" -automake -a -c +automake -Wall -a -c echo "---> generate files via GNU autoconf (autoconf)" autoconf echo "<=== rpm" @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.144 -r2.145 configure.ac --- rpm/configure.ac 27 Jun 2007 09:45:14 - 2.144 +++ rpm/configure.ac 27 Jun 2007 10:04:33 - 2.145 @@ -45,8 +45,6 @@ AC_PROG_YACC AC_PATH_PROG(AS, as, as) -AC_PATH_PROG(CTAGS, ctags, /bin/true) -AC_PATH_PROG(CSCOPE, cscope, /bin/true) dnl # GCC specifics AC_PROG_GCC_TRADITIONAL @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am rpm/perl/ Makefile.am
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: 06-Aug-2007 18:00:53 Branch: HEAD Handle: 2007080617005300 Modified files: rpm Makefile.am rpm/perlMakefile.am Log: - cleanup perl file list, some will die soon Summary: RevisionChanges Path 2.207 +12 -6 rpm/Makefile.am 1.16+1 -2 rpm/perl/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.206 -r2.207 Makefile.am --- rpm/Makefile.am 6 Aug 2007 12:51:06 - 2.206 +++ rpm/Makefile.am 6 Aug 2007 16:00:53 - 2.207 @@ -13,13 +13,19 @@ zlib/[A-Z]* zlib/*.[ch] zlib/autogen.sh zlib/configure.ac zlib/config.guess zlib/config.sub \ zlib/ltmain.sh zlib/aclocal.m4 zlib/config.h.in zlib/missing zlib/install-sh zlib/depcomp \ zlib/Makefile.in zlib/configure zlib/stamp-h.in \ +perl/typemap \ + perl/Makefile.PL.in \ + perl/00.pot.t perl/00.pod.coverage.t \ + perl/rpmxs.c perl/rpmxs.h \ + perl/RPM.xs perl/RPM.pm perl/t/01.rpm.t \ + perl/RPM/Constant.pm perl/RPM_Constant.xs perl/t/02.rpmconstant.t \ + perl/RPM_Header.xs perl/RPM/Header.pm perl/t/03.header.t \ + perl/RPM_Transaction.xs perl/RPM/Transaction.pm perl/t/04.transaction.t \ + perl/RPM_PackageIterator.xs perl/RPM/PackageIterator.pm perl/t/05.packageiterator.t \ + perl/RPM_Problems.xs perl/RPM/Problems.pm perl/t/06.problems.t \ + perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm \ perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \ - perl/README perl/RPM.pm perl/RPM.xs perl/RPM/Constant.pm perl/RPM/Header.pm \ - perl/RPM/PackageIterator.pm perl/RPM/Transaction.pm perl/RPM_Constant.xs perl/RPM_Header.xs \ - perl/RPM_PackageIterator.xs perl/RPM_Transaction.xs perl/foo.i386.rpm perl/hdlist-test.hdr \ - perl/rpmxs.c perl/rpmxs.h perl/t/00.pod.coverage.t perl/t/00.pod.t perl/t/01.rpm.t \ - perl/t/02.rpmconstant.t perl/t/03.header.t perl/t/04.transaction.t perl/t/05.packageiterator.t \ - perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm perl/test.pl perl/typemap \ + perl/README \ pubkeys/JBJ-GPG-KEY \ po/*.in po/*.po po/rpm.pot \ rpm.magic rpmqv.c \ @@ . patch -p0 <<'@@ .' Index: rpm/perl/Makefile.am $ cvs diff -u -r1.15 -r1.16 Makefile.am --- rpm/perl/Makefile.am 6 Aug 2007 13:26:14 - 1.15 +++ rpm/perl/Makefile.am 6 Aug 2007 16:00:53 - 1.16 @@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign EXTRA_DIST = \ - MANIFEST \ typemap \ Makefile.PL.in \ rpmxs.c rpmxs.h \ @@ -18,7 +17,7 @@ noinst_DATA = .made_mod -.made_mod: Makefile.perl $(EXTRA_DIST) +.made_mod: Makefile.perl $(EXTRA_DIST) MANIFEST $(MAKE) -f Makefile.perl || $(MAKE) -f Makefile.perl test: .made_mod @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 18-Dec-2009 01:42:53 Branch: HEAD Handle: 2009121800425201 Modified files: rpm Makefile.am rpm/tools Makefile.am Log: - get @LDFLAGS_STATIC drilled correctly. Summary: RevisionChanges Path 2.246 +2 -2 rpm/Makefile.am 2.142 +20 -6 rpm/tools/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.245 -r2.246 Makefile.am --- rpm/Makefile.am 25 Sep 2009 10:16:31 - 2.245 +++ rpm/Makefile.am 18 Dec 2009 00:42:52 - 2.246 @@ -131,13 +131,13 @@ noinst_HEADERS = build.h debug.h system.h rpm_SOURCES =$(top_srcdir)/build.c -rpm_LDFLAGS =@LDFLAGS_STATIC@ +rpm_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS) rpm_LDADD = rpm.o $(myLDADD) rpm.o: $(top_srcdir)/rpmqv.c $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c rpmbuild_SOURCES = $(top_srcdir)/build.c -rpmbuild_LDFLAGS = @LDFLAGS_STATIC@ +rpmbuild_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) rpmbuild_LDADD = rpmbuild.o $(myLDADD) rpmbuild.o: $(top_srcdir)/rpmqv.c $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c @@ . patch -p0 <<'@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.141 -r2.142 Makefile.am --- rpm/tools/Makefile.am 13 Dec 2009 22:05:11 - 2.141 +++ rpm/tools/Makefile.am 18 Dec 2009 00:42:53 - 2.142 @@ -54,36 +54,47 @@ dist_man_MANS = rpmgrep.1 augtool_SOURCES =augtool.c +augtool_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS) augtool_LDADD = $(RPMIO_LDADD_COMMON) chroot_SOURCES = chroot.c +chroot_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) chroot_LDADD = $(RPMIO_LDADD_COMMON) cp_SOURCES = cp.c +cp_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) cp_LDADD = $(RPMIO_LDADD_COMMON) debugedit_SOURCES = debugedit.c hashtab.c +debugedit_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) debugedit_LDADD =$(RPM_LDADD_COMMON) rpmcache_SOURCES = rpmcache.c +rpmcache_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) rpmcache_LDADD = $(RPM_LDADD_COMMON) rpmcmp_SOURCES = rpmcmp.c -rpmcmp_LDADD = $(RPM_LDADD_COMMON) +rpmcmp_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) +rpmcmp_LDADD = $(RPMDB_LDADD_COMMON) rpmdeps_SOURCES =rpmdeps.c +rpmdeps_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS) rpmdeps_LDADD = $(RPM_LDADD_COMMON) rpmdigest_SOURCES = rpmdigest.c +rpmdigest_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) rpmdigest_LDADD =$(RPMIO_LDADD_COMMON) find_SOURCES = rpmfind.c +find_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) find_LDADD = $(RPMIO_LDADD_COMMON) grep_SOURCES = rpmgrep.c +grep_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) grep_LDADD = $(RPMIO_LDADD_COMMON) mtree_SOURCES = rpmmtree.c +mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) mtree_LDADD =$(RPM_LDADD_COMMON) rpmrepo_SOURCES =rpmrepo.c @@ -109,13 +120,15 @@ ## Traditional rpm2cpio ## rpm2cpio_SOURCES = rpm2cpio.c -rpm2cpio_LDADD = $(RPM_LDADD_COMMON) +rpm2cpio_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) +rpm2cpio_LDADD = $(LDFLAGS) $(RPM_LDADD_COMMON) ## ## keyctl(1) clone ## rpmkey_SOURCES =rpmkey.c -rpmkey_LDADD = $(RPM_LDADD_COMMON) -lkeyutils +rpmkey_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) +rpmkey_LDADD = $(LDFLAGS) $(RPM_LDADD_COMMON) -lkeyutils ## ## XAR <-> RPM package converter @@ -141,7 +154,7 @@ db_tool_CPPFLAGS += \ -DWITH_DB_RPC endif -db_tool_LDFLAGS = +db_tool_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS) db_tool_LDADD = # for db_recover db_tool_LDADD += \ @@ -173,8 +186,9 @@ $(top_builddir)/db3/libdb-4.8.la endif -pkgbin_PROGRAMS += db_sql -db_sql_SOURCES = ../db/db_sql/db_sql.c +pkgbin_PROGRAMS += db_sql +db_sql_SOURCES = ../db/db_sql/db_sql.c +db_sql_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) db_sql_LDADD = \ $(top_builddir)/db3/parse.lo \ $(top_builddir)/db3/preparser.lo \ @@ .
[CVS] RPM: rpm/ Makefile.am configure.ac rpm/doc/ 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: 04-Jul-2007 19:31:16 Branch: HEAD Handle: 2007070418311600 Modified files: rpm Makefile.am configure.ac rpm/doc Makefile.am Log: simplify the NLS Autoconf processing by leveraging Automake features and use this functionality also in the doc/ subdir Summary: RevisionChanges Path 2.185 +6 -2 rpm/Makefile.am 2.162 +1 -3 rpm/configure.ac 1.13+4 -1 rpm/doc/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.184 -r2.185 Makefile.am --- rpm/Makefile.am 4 Jul 2007 16:32:44 - 2.184 +++ rpm/Makefile.am 4 Jul 2007 17:31:16 - 2.185 @@ -18,8 +18,12 @@ po/*.in po/*.po po/rpm.pot \ rpm.magic rpmqv.c rpm.c -SUBDIRS = \ - @ENABLE_NLS_SUBDIR@ \ +SUBDIRS = +if USE_NLS +SUBDIRS += \ + po +endif +SUBDIRS += \ @WITH_DB_SUBDIR@ \ @WITH_ZLIB_SUBDIR@ \ @WITH_LUA_SUBDIR@ \ @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.161 -r2.162 configure.ac --- rpm/configure.ac 4 Jul 2007 16:32:44 - 2.161 +++ rpm/configure.ac 4 Jul 2007 17:31:16 - 2.162 @@ -406,9 +406,7 @@ AC_CHECK_HEADERS(locale.h) AM_GNU_GETTEXT_VERSION(0.16) AM_GNU_GETTEXT([external]) -ENABLE_NLS_SUBDIR="" -test ".$USE_NLS" = .yes && ENABLE_NLS_SUBDIR="po" -AC_SUBST([ENABLE_NLS_SUBDIR]) +AM_CONDITIONAL(USE_NLS, [ test ".$USE_NLS" = .yes ]) dnl # specific features AC_SYS_LARGEFILE @@ . patch -p0 <<'@@ .' Index: rpm/doc/Makefile.am $ cvs diff -u -r1.12 -r1.13 Makefile.am --- rpm/doc/Makefile.am 24 Oct 2002 21:36:15 - 1.12 +++ rpm/doc/Makefile.am 4 Jul 2007 17:31:16 - 1.13 @@ -1,6 +1,9 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = manual fr ja ko pl ru sk +SUBDIRS = manual +if USE_NLS +SUBDIRS += fr ja ko pl ru sk +endif man_MANS = gendiff.1 rpm.8 rpmbuild.8 rpmcache.8 rpmdeps.8 rpmgraph.8 rpm2cpio.8 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am autogen.sh configure.ac rpm/lib/ poptALL.c...
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: 10-Jun-2007 22:44:44
Branch: HEAD Handle: 2007061021444202
Modified files:
rpm Makefile.am autogen.sh configure.ac rpm.spec.in
system.h
rpm/lib poptALL.c rpmrc.c
rpm/po ChangeLog rpm.pot
rpm/rpmdb db3.c rpmdb.c
rpm/scripts Makefile.am
Removed files:
rpm/scripts brp-redhat.in
Log:
pull recent devel from rpm-4_5 branch.
Summary:
RevisionChanges Path
2.162 +2 -2 rpm/Makefile.am
2.70+2 -7 rpm/autogen.sh
2.73+15 -35 rpm/configure.ac
2.29+1 -1 rpm/lib/poptALL.c
2.196 +3 -1 rpm/lib/rpmrc.c
1.3 +4 -0 rpm/po/ChangeLog
1.840 +26 -26 rpm/po/rpm.pot
2.433 +9 -67 rpm/rpm.spec.in
1.65+34 -16 rpm/rpmdb/db3.c
1.130 +1 -38 rpm/rpmdb/rpmdb.c
1.35+2 -2 rpm/scripts/Makefile.am
1.3 +0 -13 rpm/scripts/brp-redhat.in
2.64+2 -0 rpm/system.h
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.161 -r2.162 Makefile.am
--- rpm/Makefile.am 30 May 2007 02:49:31 - 2.161
+++ rpm/Makefile.am 10 Jun 2007 20:44:42 - 2.162
@@ -4,7 +4,7 @@
LINT = splint
-EXTRA_DIST = config.rpath m4/ChangeLog CHANGES CREDITS Doxyheader GROUPS
INSTALL \
+EXTRA_DIST = m4/ChangeLog config.rpath m4/ChangeLog CHANGES CREDITS
Doxyheader GROUPS INSTALL \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
config.site db db3/configure gendiff installplatform platform* \
perl/* \
@@ -37,7 +37,7 @@
@WITH_ZLIB_LIB@ \
@LIBMISC@
-rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
+rpmbindir = `echo $(bindir)`
rpmbin_PROGRAMS = rpm
bin_SCRIPTS =gendiff
@@ .
patch -p0 <<'@@ .'
Index: rpm/autogen.sh
$ cvs diff -u -r2.69 -r2.70 autogen.sh
--- rpm/autogen.sh30 May 2007 04:16:10 - 2.69
+++ rpm/autogen.sh10 Jun 2007 20:44:42 - 2.70
@@ -68,15 +68,10 @@
(echo "--- yaml"; cd yaml; sh ./autogen.sh "$@")
fi
-for d in wdj wnh yaml; do
-[ -d $d ] && continue
-mkdir -p $d
-touch $d/Makefile.in
-done
-
echo "--- rpm"
+[ -f po/Makefile.in.in ] || gettextize --copy --force --intl
$libtoolize --copy --force
-aclocal
+aclocal -I m4
autoheader
automake -a -c
autoconf
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.72 -r2.73 configure.ac
--- rpm/configure.ac 5 Jun 2007 02:51:04 - 2.72
+++ rpm/configure.ac 10 Jun 2007 20:44:42 - 2.73
@@ -1,5 +1,5 @@
AC_PREREQ(2.57)
-AC_INIT(rpm, 4.4.9, [EMAIL PROTECTED])
+AC_INIT(rpm, 4.5, [EMAIL PROTECTED])
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([rpmqv.c])
AC_CONFIG_HEADERS([config.h])
@@ -18,19 +18,19 @@
dnl Set of available languages.
ALL_LINGUAS="cs da de fi fr gl is ja ko no pl pt pt_BR ro ru sk sl sr sv tr
uk"
+AC_AIX
+AC_MINIX
+
dnl Checks for programs.
-AC_PROG_CXX
AC_PROG_AWK
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-dnl AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_YACC
-AC_AIX
-AC_MINIX
AS=${AS-as}
AC_SUBST(AS)
if test "$ac_cv_c_compiler_gnu" = yes; then
@@ -721,13 +721,6 @@
AC_CHECK_HEADERS(locale.h)
AM_GNU_GETTEXT([external])
-dnl TVM:
-dnl horrible *temporary* hack to make sure that if we found gettext() in
-dnl -lintl that we add -lintl *back* to $LIBS.
-dnl
-dnl if test X$gt_cv_func_gettext_libintl = Xyes ; then
-dnl LIBS="-lintl $LIBS"
-dnl fi
dnl Checks for header files we can live without.
AC_HEADER_STDC
@@ -1480,28 +1473,15 @@
[Colon separated paths of macro files to read.])
AC_SUBST(MACROFILES)
-LIBRPMRC_FILENAME="${USRLIBRPM}/rpmrc"
-AC_DEFINE_UNQUOTED(LIBRPMRC_FILENAME, "$LIBRPMRC_FILENAME",
- [Full path to rpmrc configuration file (usually /usr/lib/rpm/rpmrc)])
-AC_SUBST(LIBRPMRC_FILENAME)
-
-VENDORRPMRC_FILENAME="${USRLIBRPM}/${RPMCANONVENDOR}/rpmrc"
-AC_DEFINE_UNQUOTED(VENDORRPMRC_FILENAME, "$VENDORRPMRC_FILENAME",
- [Full pat
[CVS] RPM: rpm/ Makefile.am rpm/perl/ Makefile.PL.in Makefile.am RPM.x...
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: 07-Aug-2007 02:10:00 Branch: HEAD Handle: 2007080701095801 Added files: rpm/perlRPM_Dependencies.xs RPM_Files.xs RPM_Spec.xs rpm/perl/RPMDependencies.pm Files.pm Spec.pm rpm/perl/t 07.files.t 08.dependencies.t 09.spec.t Modified files: rpm Makefile.am rpm/perlMakefile.PL.in Makefile.am RPM.xs rpmxs.c rpmxs.h typemap rpm/perl/t 00.pod.coverage.t Log: - add Spec, rpmfi, rpmds object binding to perl modules Summary: RevisionChanges Path 2.208 +4 -1 rpm/Makefile.am 1.13+3 -0 rpm/perl/Makefile.PL.in 1.17+3 -0 rpm/perl/Makefile.am 1.20+3 -0 rpm/perl/RPM.xs 1.1 +33 -0 rpm/perl/RPM/Dependencies.pm 1.1 +33 -0 rpm/perl/RPM/Files.pm 1.1 +34 -0 rpm/perl/RPM/Spec.pm 1.1 +294 -0 rpm/perl/RPM_Dependencies.xs 1.1 +213 -0 rpm/perl/RPM_Files.xs 1.1 +253 -0 rpm/perl/RPM_Spec.xs 1.3 +95 -0 rpm/perl/rpmxs.c 1.4 +13 -0 rpm/perl/rpmxs.h 1.4 +7 -1 rpm/perl/t/00.pod.coverage.t 1.1 +6 -0 rpm/perl/t/07.files.t 1.1 +6 -0 rpm/perl/t/08.dependencies.t 1.1 +6 -0 rpm/perl/t/09.spec.t 1.10+33 -0 rpm/perl/typemap patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.207 -r2.208 Makefile.am --- rpm/Makefile.am 6 Aug 2007 16:00:53 - 2.207 +++ rpm/Makefile.am 7 Aug 2007 00:09:58 - 2.208 @@ -15,7 +15,7 @@ zlib/Makefile.in zlib/configure zlib/stamp-h.in \ perl/typemap \ perl/Makefile.PL.in \ - perl/00.pot.t perl/00.pod.coverage.t \ + perl/t/00.pod.t perl/t/00.pod.coverage.t \ perl/rpmxs.c perl/rpmxs.h \ perl/RPM.xs perl/RPM.pm perl/t/01.rpm.t \ perl/RPM/Constant.pm perl/RPM_Constant.xs perl/t/02.rpmconstant.t \ @@ -23,6 +23,9 @@ perl/RPM_Transaction.xs perl/RPM/Transaction.pm perl/t/04.transaction.t \ perl/RPM_PackageIterator.xs perl/RPM/PackageIterator.pm perl/t/05.packageiterator.t \ perl/RPM_Problems.xs perl/RPM/Problems.pm perl/t/06.problems.t \ + perl/RPM_Files.xs perl/RPM/Files.pm perl/t/07.files.t \ + perl/RPM_Dependencies.xs perl/RPM/Dependencies.pm perl/t/08.dependencies.t \ + perl/RPM_Spec.xs perl/RPM/Spec.pm perl/t/09.spec.t \ perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm perl/test-rpm-1.0-1.src.rpm \ perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \ perl/README \ @@ . patch -p0 <<'@@ .' Index: rpm/perl/Makefile.PL.in $ cvs diff -u -r1.12 -r1.13 Makefile.PL.in --- rpm/perl/Makefile.PL.in 6 Aug 2007 13:26:14 - 1.12 +++ rpm/perl/Makefile.PL.in 7 Aug 2007 00:09:58 - 1.13 @@ -15,6 +15,9 @@ RPM_Transaction.o RPM_PackageIterator.o RPM_Problems.o +RPM_Spec.o +RPM_Files.o +RPM_Dependencies.o ); WriteMakefile( @@ . patch -p0 <<'@@ .' Index: rpm/perl/Makefile.am $ cvs diff -u -r1.16 -r1.17 Makefile.am --- rpm/perl/Makefile.am 6 Aug 2007 16:00:53 - 1.16 +++ rpm/perl/Makefile.am 7 Aug 2007 00:09:58 - 1.17 @@ -12,6 +12,9 @@ RPM_Transaction.xs RPM/Transaction.pm t/04.transaction.t \ RPM_PackageIterator.xs RPM/PackageIterator.pm t/05.packageiterator.t \ RPM_Problems.xs RPM/Problems.pm t/06.problems.t \ + RPM_Files.xs RPM/Files.pm t/07.files.t \ + RPM_Dependencies.xs RPM/Dependencies.pm t/08.dependencies.t \ + RPM_Spec.xs RPM/Spec.pm t/09.spec.t \ t/00.pod.coverage.t t/00.pod.t \ hdlist-test.hdr test-rpm-1.0-1.noarch.rpm test-rpm-1.0-1.src.rpm @@ . patch -p0 <<'@@ .' Index: rpm/perl/RPM.xs $ cvs diff -u -r1.19 -r1.20 RPM.xs --- rpm/perl/RPM.xs 6 Aug 2007 13:26:14 - 1.19 +++ rpm/perl/RPM.xs 7 Aug 2007 00:09:58 - 1.20 @@ -50,6 +50,9 @@ crutch_stack_wrap(boot_RPM__Transaction(aTHX_ cv)); crutch_stack_wrap(boot_RPM__PackageIte
[CVS] RPM: rpm/ Makefile.am configure.ac rpm/perl/ .cvsignore rpm/ rpm...
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: 11-Jun-2007 03:42:11
Branch: HEAD Handle: 2007061102421001
Modified files:
rpm Makefile.am configure.ac rpm.spec.in
rpm/perl.cvsignore
rpm/rpmdb .cvsignore Makefile.am
Log:
add version stamp to macros.
rename Berkeley DB utilities back to original name.
Summary:
RevisionChanges Path
2.164 +7 -6 rpm/Makefile.am
2.75+1 -1 rpm/configure.ac
1.3 +3 -2 rpm/perl/.cvsignore
2.435 +36 -35 rpm/rpm.spec.in
1.10+12 -12 rpm/rpmdb/.cvsignore
1.54+27 -27 rpm/rpmdb/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.163 -r2.164 Makefile.am
--- rpm/Makefile.am 10 Jun 2007 23:29:04 - 2.163
+++ rpm/Makefile.am 11 Jun 2007 01:42:10 - 2.164
@@ -8,7 +8,7 @@
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
config.site db db3/configure gendiff installplatform platform* \
perl/* \
- wdj/JBJ-GPG-KEY wdj/Makefile.in wnh/Makefile.in \
+ pubkeys/JBJ-GPG-KEY \
po/*.in po/*.po po/rpm.pot \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
@@ -44,20 +44,21 @@
pkglibdir = @USRLIBRPM@
pkglib_PROGRAMS =rpmb
-pkglib_DATA =rpmpopt-$(VERSION) macros
+pkglib_DATA =rpmpopt-$(VERSION) macros-$(VERSION)
rpmpopt-$(VERSION): rpmpopt
cp rpmpopt $@
+macros-$(VERSION): macros
+ cp macros $@
+
noinst_HEADERS = build.h debug.h system.h
-rpm_SOURCES =
+rpm_SOURCES =$(top_srcdir)/build.c
rpm_LDFLAGS =$(myLDFLAGS) $(staticLDFLAGS)
rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a
$(myLDADD)
-#rpm_LDFLAGS = $(myLDFLAGS)
-#rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a
$(myLDADD)
rpm.o: $(top_srcdir)/rpmqv.c
- $(COMPILE) -fpie -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@
-c $<
+ $(COMPILE) -fpie -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK
-DIAM_RPMQV -o $@ -c $<
rpmb_SOURCES = $(top_srcdir)/build.c
rpmb_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.74 -r2.75 configure.ac
--- rpm/configure.ac 10 Jun 2007 23:29:04 - 2.74
+++ rpm/configure.ac 11 Jun 2007 01:42:10 - 2.75
@@ -1468,7 +1468,7 @@
[Full path to rpm system configuration directory (usually /etc/rpm)])
AC_SUBST(SYSCONFIGDIR)
-MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
+MACROFILES="${USRLIBRPM}/macros-${VERSION}:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
[Colon separated paths of macro files to read.])
AC_SUBST(MACROFILES)
@@ .
patch -p0 <<'@@ .'
Index: rpm/perl/.cvsignore
$ cvs diff -u -r1.2 -r1.3 .cvsignore
--- rpm/perl/.cvsignore 16 Jul 1999 08:46:16 - 1.2
+++ rpm/perl/.cvsignore 11 Jun 2007 01:42:11 - 1.3
@@ -1,5 +1,6 @@
-rpm.bs
-rpm.c
+RPM-*
+RPM.bs
+RPM.c
pm_to_blib
Makefile
blib
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
$ cvs diff -u -r2.434 -r2.435 rpm.spec.in
--- rpm/rpm.spec.in 10 Jun 2007 23:29:04 - 2.434
+++ rpm/rpm.spec.in 11 Jun 2007 01:42:10 - 2.435
@@ -4,6 +4,9 @@
%define with_bzip2 @[EMAIL PROTECTED]
%define with_apidocs@[EMAIL PROTECTED]
+# XXX ignore unpackaged files for now
+%define _unpackaged_files_terminate_build 0
+
%{!?_usrlibrpm:%global _usrlibrpm @[EMAIL PROTECTED]
%define __prefix%{?_prefix}%{!?_prefix:/usr}
@@ -262,16 +265,14 @@
%endif
%files -f rpm.lang
-%doc CHANGES GROUPS doc/manual/[a-z]*
-# XXX add to EXTRAS
-#%pubkey pubkeys/JBJ-GPG-KEY
+#XXX %doc CHANGES GROUPS doc/manual/[a-z]*
+%pubkey pubkeys/JBJ-GP
[CVS] RPM: rpm/ Makefile.am acinclude.m4 rpm/build/ Makefile.am rpm/ 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: 20-Jun-2007 23:10:23 Branch: HEAD Handle: 2007062022101903 Added files: rpm acinclude.m4 Modified files: rpm Makefile.am configure.ac debug.h rpm.spec.in rpm/build Makefile.am rpm/lib Makefile.am rpm/python Makefile.am rpm/rpmdb Makefile.am rpmdb.c rpm/rpmio Makefile.am rpm/tools Makefile.am Log: .open "peril sensitive sunglasses" Migrate RPM build environment's support for building against third-party libraries from an evolutionary and practically too constrained approach to a more flexible approach based on a central Autoconf macro RPM_CHECK_LIB. RPM_CHECK_LIB is a complex Autoconf macro for sophisticated checking the availability of third-party libraries in a cross-platform way and extending the RPM build environment for correctly building against it. It especially supports the following particular major features: - is aware of old-style -config style scripts - is aware of new-style pkg-config(1) .pc configuration files - searches under standard sub-directories "include", "lib", etc. - searches under arbitrary sub-areas of a tree like ".libs", etc. - searches in standard system locations (implicitly) - supports searching for function in multiple libraries - supports searching for multiple headers - supports multiple search locations (fallbacks!) To give an impression what we are talking about: for building RPM against POPT one can use... $ ./configure --with-popt=/usr/local:external:internal ...and this way RPM will search for POPT externally under /usr/local, then externally under standard locations (/usr/lib, /usr/include) and if all this fails it would even fallback to an internally provided copy (subdir ./popt/). For each location RPM will leverage many approaches in sequence to determine whether POPT is really present under this location, of course. This new approach certainly might break at least once the existing build environments of RPM developers, but this cannot be changed as the Autoconf API has changed to some extend. Nevertheless, this modernized build environment was successfully used to build RPM on the following particular Unix platforms: - ix86-freebsd6.2 - amd64-freebsd6.2 - ix86-debian3.1 - ix86-rhel3 - ix86-rhel4 - sparc64-solaris8 - ix86-solaris9 - sparc64-solaris9 - sparc64-solaris10 - ix86-gentoo1.12.8 - ix86-suse9 - ix86-ubuntu6.06 Detailed documentation on how to build RPM with this updated build environment will be provided in the INSTALL document soon, too. Summary: RevisionChanges Path 2.171 +21 -7 rpm/Makefile.am 2.1 +346 -0 rpm/acinclude.m4 2.55+0 -3 rpm/build/Makefile.am 2.97+78 -209rpm/configure.ac 2.2 +1 -1 rpm/debug.h 2.151 +0 -4 rpm/lib/Makefile.am 1.67+1 -4 rpm/python/Makefile.am 2.444 +1 -1 rpm/rpm.spec.in 1.57+1 -6 rpm/rpmdb/Makefile.am 1.132 +2 -2 rpm/rpmdb/rpmdb.c 1.81+0 -26 rpm/rpmio/Makefile.am 2.87+1 -5 rpm/tools/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.170 -r2.171 Makefile.am --- rpm/Makefile.am 20 Jun 2007 16:50:20 - 2.170 +++ rpm/Makefile.am 20 Jun 2007 21:10:19 - 2.171 @@ -18,29 +18,43 @@ po/*.in po/*.po po/rpm.pot \ rpm.magic rpmqv.c rpm.c -SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts doc . +SUBDIRS = \ + po \ + misc \ + @WITH_DB_SUBDIR@ \ + @WITH_ZLIB_SUBDIR@ \ + @WITH_LUA_SUBDIR@ \ + @WITH_FILE_SUBDIR@ \ + @WITH_NEON_SUBDIR@ \ + @WITH_BEECRYPT_SUBDIR@ \ + @WITH_ELFUTILS_SUBDIR@ \ + rpmio \ + rpmdb \ + lib \ + build \ + @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ \ + tools \ + scripts \ + doc \
[CVS] RPM: rpm/ Makefile.am rpm/build/ Makefile.am rpm/ configure.ac r...
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: 24-Jun-2007 20:12:32
Branch: HEAD Handle: 2007062419123002
Modified files:
rpm Makefile.am configure.ac
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/miscMakefile.am
rpm/perlMakefile.PL.in
rpm/python Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
rpm/tools Makefile.am
Log:
remove an old INCPATH hack I see no more reason for. Use standard
CPPFLAGS extension instead. Also still keep but shrink the nasty
platform-specific 'addlib' hacks
Summary:
RevisionChanges Path
2.173 +1 -2 rpm/Makefile.am
2.57+1 -2 rpm/build/Makefile.am
2.111 +28 -64 rpm/configure.ac
2.152 +1 -2 rpm/lib/Makefile.am
1.20+1 -1 rpm/misc/Makefile.am
1.2 +1 -1 rpm/perl/Makefile.PL.in
1.69+1 -2 rpm/python/Makefile.am
1.58+1 -2 rpm/rpmdb/Makefile.am
1.84+1 -2 rpm/rpmio/Makefile.am
2.88+1 -2 rpm/tools/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.172 -r2.173 Makefile.am
--- rpm/Makefile.am 20 Jun 2007 21:42:24 - 2.172
+++ rpm/Makefile.am 24 Jun 2007 18:12:30 - 2.173
@@ -44,8 +44,7 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
- @WITH_LIBELF_INCLUDE@ \
- @INCPATH@
+ @WITH_LIBELF_INCLUDE@
staticLDFLAGS = # @LDFLAGS_STATIC@ # @LDFLAGS_NPTL@
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
$ cvs diff -u -r2.56 -r2.57 Makefile.am
--- rpm/build/Makefile.am 21 Jun 2007 18:19:00 - 2.56
+++ rpm/build/Makefile.am 24 Jun 2007 18:12:30 - 2.57
@@ -12,8 +12,7 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
@WITH_LIBELF_INCLUDE@ \
- -I$(top_srcdir)/misc \
- @INCPATH@
+ -I$(top_srcdir)/misc
LIBS =
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.110 -r2.111 configure.ac
--- rpm/configure.ac 24 Jun 2007 10:27:20 - 2.110
+++ rpm/configure.ac 24 Jun 2007 18:12:30 - 2.111
@@ -155,14 +155,40 @@
LDFLAGS_NPTL=
if test -f /usr/lib/nptl/libpthread.a ; then
LDFLAGS_NPTL="-L/usr/lib/nptl"
-#INCPATH="$INCPATH -I/usr/include/nptl"
fi
if test -f /usr/lib64/nptl/libpthread.a ; then
LDFLAGS_NPTL="-L/usr/lib64/nptl"
-#INCPATH="$INCPATH -I/usr/include/nptl"
fi
AC_SUBST(LDFLAGS_NPTL)
+dnl # old RPM 4.x style platform-specific flag extension hack
+addlib () {
+ l=$1
+ shift
+ case "$target" in
+ *-*-solaris2.[234567]) LIBS="$LIBS -L$l -R$l $*" ;;
+ * ) LIBS="$LIBS -L$l $*";;
+ esac
+}
+if test "$cross_compiling" != "yes" && \
+test ".$prefix" != .NONE && \
+test ".$prefix" != "./usr"; then
+ if test -d $dir/lib; then
+ addlib $dir/lib
+ fi
+ if test -d $dir/include; then
+ CPPFLAGS="$CPPFLAGS -I$prefix/include"
+ fi
+fi
+if test -d /usr/ucblib; then
+case $build in
+mips-sni-sysv4 )
+ addlib /usr/ccs/lib -lc
+ addlib /usr/ucblib
+ ;;
+esac
+fi
+
dnl
dnl look for POSIX chmod attributes
dnl
@@ -308,15 +334,6 @@
AC_PATH_PROG(__OBJDUMP, objdump, %{_bindir}/objdump, $MYPATH)
AC_PATH_PROG(__STRIP, strip, %{_bindir}/strip, $MYPATH)
-addlib() {
- l=$1
- shift
- case "$target" in
-*-*-solaris2.[234567]) LIBS="$LIBS -L$l -R$l $*";;
-*) LIBS="$LIBS -L$l $*";;
- esac
-}
-
#=
RPM_CHECK_LIB([ZLib], [zlib],
@@ -335,58 +352,6 @@
#=
-localdone=
-
-dirs=$prefix
-if test "$cross_compiling" != "yes"; then
- dirs="$dirs"
-for dir in $dirs
-do
- case $dir in
- NONE|/usr) continue;;
- /usr/local)
- if test X$localdone != X ; then continue; fi
- localdone="$dir"
- ;;
- esac
-
- AC_MSG_CHECKING(for $dir/lib in LIBS)
- if test -d $dir/lib
[CVS] RPM: rpm/ Makefile.am rpm/build/ Makefile.am rpm/ configure.ac r...
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: 16-Jul-2007 10:02:38 Branch: HEAD Handle: 2007071609023601 Modified files: rpm Makefile.am configure.ac rpm/build Makefile.am rpm/lib Makefile.am rpm/miscMakefile.am rpm/python Makefile.am rpm/rpmdb Makefile.am rpm/rpmio Makefile.am rpmlua.c Log: Automake horribly fails because a _conditional_ AC_CONFIG_FILES([lua/Makefile]) is just not possible. As Jeff already removed the lua/ subdir and we can build against an external Lua just fine, remove the support for the internal variant at all as this seems to be the only possibility to make piece with Automake here. For those who do not understand the background: lua/ used RPM's Automake/Autoconf build facility (instead of its own stand-alone one) and Automake/Autoconf just cannot be teached about a not existing but supported lua/ subdir where files have to generated for. Summary: RevisionChanges Path 2.188 +0 -2 rpm/Makefile.am 2.64+0 -1 rpm/build/Makefile.am 2.179 +3 -14 rpm/configure.ac 2.159 +0 -1 rpm/lib/Makefile.am 1.25+0 -1 rpm/misc/Makefile.am 1.74+0 -1 rpm/python/Makefile.am 1.69+0 -1 rpm/rpmdb/Makefile.am 1.96+0 -1 rpm/rpmio/Makefile.am 2.17+0 -10 rpm/rpmio/rpmlua.c patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.187 -r2.188 Makefile.am --- rpm/Makefile.am 10 Jul 2007 19:09:57 - 2.187 +++ rpm/Makefile.am 16 Jul 2007 08:02:36 - 2.188 @@ -26,7 +26,6 @@ SUBDIRS += \ @WITH_DB_SUBDIR@ \ @WITH_ZLIB_SUBDIR@ \ - @WITH_LUA_SUBDIR@ \ @WITH_FILE_SUBDIR@ \ misc \ rpmio \ @@ -50,7 +49,6 @@ -I$(top_srcdir)/misc \ @WITH_DB_CPPFLAGS@ \ @WITH_ZLIB_CPPFLAGS@ \ - @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ myLDADD = \ @@ . patch -p0 <<'@@ .' Index: rpm/build/Makefile.am $ cvs diff -u -r2.63 -r2.64 Makefile.am --- rpm/build/Makefile.am 27 Jun 2007 20:20:26 - 2.63 +++ rpm/build/Makefile.am 16 Jul 2007 08:02:36 - 2.64 @@ -16,7 +16,6 @@ -I$(top_srcdir)/misc \ @WITH_DB_CPPFLAGS@ \ @WITH_ZLIB_CPPFLAGS@ \ - @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ pkgincdir = $(pkgincludedir) @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.178 -r2.179 configure.ac --- rpm/configure.ac 15 Jul 2007 21:50:16 - 2.178 +++ rpm/configure.ac 16 Jul 2007 08:02:36 - 2.179 @@ -825,24 +825,13 @@ AC_SUBST(DBAPI) dnl # Lua -WITH_LUA_SUBDIR_DEF="" -WITH_LUA_SUBDIR_LIB="" RPM_CHECK_LIB( [Lua], [lua], [lua], [lua_newstate], [lua.h], -[no,external:internal:none], [lua:local], -[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then - AC_CHECK_LIB(dl, dlopen, [ LIBS="-ldl $LIBS"; WITH_LUA_SUBDIR_LIB="-ldl" ]) - AC_CHECK_FUNC(dlopen, [ WITH_LUA_SUBDIR_DEF="-DLUA_USE_DLOPEN" ]) - AC_DEFINE(WITH_LUA_INTERNAL, 1, [Define if building with internal Lua]) - AC_CONFIG_FILES([lua/Makefile]) - else - AC_CHECK_LIB(dl, dlopen) - AC_CHECK_FUNC(dlopen) - fi +[no,external:none], [], +[ AC_CHECK_LIB(dl, dlopen) + AC_CHECK_FUNC(dlopen) ], []) -AC_SUBST(WITH_LUA_SUBDIR_DEF) -AC_SUBST(WITH_LUA_SUBDIR_LIB) dnl # DMalloc RPM_CHECK_LIB( @@ . patch -p0 <<'@@ .' Index: rpm/lib/Makefile.am $ cvs diff -u -r2.158 -r2.159 Makefile.am --- rpm/lib/Makefile.am 9 Jul 2007 22:07:25 - 2.158 +++ rpm/lib/Makefile.am 16 Jul 2007 08:02:36 - 2.159 @@ -14,7 +14,6 @@ -I$(top_srcdir)/misc \ @WITH_DB_CPPFLAGS@ \ @WITH_ZLIB_CPPFLAGS@ \ - @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ EXTRA_DIST = getdate.y librpm.vers @@ . patch -p0 <<'@@ .' Index: rpm/misc/Makefile.am
[CVS] RPM: rpm/ Makefile.am rpm/build/ Makefile.am rpm/lib/ Makefile.a...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 20-Aug-2009 18:51:30
Branch: HEAD Handle: 2009082016512802
Modified files:
rpm Makefile.am
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
Log:
- add a phony "mccabe" make target to generate McCabe metrics using
pmmccabe.
Summary:
RevisionChanges Path
2.240 +9 -0 rpm/Makefile.am
2.76+5 -0 rpm/build/Makefile.am
2.192 +6 -1 rpm/lib/Makefile.am
1.109 +5 -0 rpm/rpmdb/Makefile.am
1.255 +5 -0 rpm/rpmio/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.239 -r2.240 Makefile.am
--- rpm/Makefile.am 6 Aug 2009 00:49:39 - 2.239
+++ rpm/Makefile.am 20 Aug 2009 16:51:28 - 2.240
@@ -3,6 +3,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
LINT = splint
+MCCABE = pmccabe
EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL cpuinfo.yaml \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
@@ -150,6 +151,14 @@
`make -s sources -C rpmio` \
`make -s sources -C file/src`
+.PHONY: mccabe
+mccabe:
+ @$(MCCABE) rpmqv.c $(rpmbuild_SOURCES) \
+ `make -s sources -C build` \
+ `make -s sources -C lib` \
+ `make -s sources -C rpmdb` \
+ `make -s sources -C rpmio` | sort -nr | head -n 30
+
.PHONY: updatepo
updatepo:
rsync -Lrtvz translationproject.org::tp/latest/rpm/ po
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
$ cvs diff -u -r2.75 -r2.76 Makefile.am
--- rpm/build/Makefile.am 13 Apr 2009 18:31:54 - 2.75
+++ rpm/build/Makefile.am 20 Aug 2009 16:51:29 - 2.76
@@ -3,6 +3,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
LINT = splint
+MCCABE = pmccabe
EXTRA_DIST = librpmbuild.vers
@@ -88,6 +89,10 @@
lint:
$(LINT) ${DEFS} ${INCLUDES} ${librpmbuild_la_SOURCES}
+.PHONY: mccabe
+mccabe:
+ $(MCCABE) $(librpmbuild_la_SOURCES) | sort -n -r | head -n 20
+
.PHONY: lcov-reset # run lcov from scratch, always
lcov-reset:
make lcov-run
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
$ cvs diff -u -r2.191 -r2.192 Makefile.am
--- rpm/lib/Makefile.am 6 Aug 2009 00:52:28 - 2.191
+++ rpm/lib/Makefile.am 20 Aug 2009 16:51:29 - 2.192
@@ -3,6 +3,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
LINT = splint
+MCCABE = pmccabe
SUBDIRS = # tests
@@ -38,7 +39,7 @@
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
pkginc_HEADERS = \
rpmcli.h rpmversion.h rpmds.h rpmfi.h rpmps.h \
- rpmrc.h rpmte.h rpmts.h rpm4compat.h rpm46compat
+ rpmrc.h rpmte.h rpmts.h rpm4compat.h rpm46compat.h
noinst_HEADERS = \
filetriggers.h fs.h fsm.h manifest.h misc.h psm.h rpmal.h \
rpmfc.h rpmgi.h rpmlib.h rpmlock.h rpmluaext.h rpmrollback.h
@@ -102,6 +103,10 @@
lint:
$(LINT) $(DEFS) $(INCLUDES) $(librpm_la_SOURCES)
+.PHONY: mccabe
+mccabe:
+ $(MCCABE) $(librpm_la_SOURCES) | sort -n -r | head -n 20
+
.PHONY: lcov-reset # run lcov from scratch, always
lcov-reset:
make lcov-run
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
$ cvs diff -u -r1.108 -r1.109 Makefile.am
--- rpm/rpmdb/Makefile.am 1 Jun 2009 13:22:37 - 1.108
+++ rpm/rpmdb/Makefile.am 20 Aug 2009 16:51:29 - 1.109
@@ -3,6 +3,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
LINT = splint
+MCCABE = pmccabe
SUBDIRS = # tests
@@ -132,6 +133,10 @@
lint:
$(LINT) $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES) $(DBLIBSRCS)
+.PHONY: mccabe
+mccabe:
+ $(MCCABE) $(librpmdb_la_SOURCES) $(DBLIBSRCS) | sort -n -r | head -n 10
+
.PHONY: lcov-reset # run lcov from scratch, always
lcov-reset:
make lcov-run
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.254 -r1.255 Makefile.am
[CVS] RPM: rpm/ Makefile.am macros.in rpm/macros/ macros.in perl.in ph...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Aug-2009 05:18:38
Branch: HEAD Handle: 2009082103183602
Modified files:
rpm Makefile.am
rpm/macros macros.in perl.in php.in python.in
rpm/perlRPM.xs
rpm/rpmio librpmio.vers macro.c rpmlua.c rpmmacro.h
Removed files:
rpm macros.in
Log:
- macros: refactor perl/php/python peculier config into separate file.
- macros: expand %{load:...} immediiately/recursively when loading.
Summary:
RevisionChanges Path
2.242 +7 -2 rpm/Makefile.am
1.291 +0 -1765 rpm/macros.in
1.2 +7 -50 rpm/macros/macros.in
1.2 +31 -7 rpm/macros/perl.in
1.2 +3 -5 rpm/macros/php.in
1.2 +24 -9 rpm/macros/python.in
1.32+1 -1 rpm/perl/RPM.xs
2.136 +1 -0 rpm/rpmio/librpmio.vers
2.237 +48 -12 rpm/rpmio/macro.c
2.75+2 -1 rpm/rpmio/rpmlua.c
2.54+2 -1 rpm/rpmio/rpmmacro.h
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.241 -r2.242 Makefile.am
--- rpm/Makefile.am 21 Aug 2009 00:11:23 - 2.241
+++ rpm/Makefile.am 21 Aug 2009 03:18:36 - 2.242
@@ -116,8 +116,13 @@
endif
pkglibdir = @USRLIBRPM@
-pkglib_DATA =rpmpopt macros/macros cpuinfo.yaml
-pkglib_SCRIPTS = install-sh mkinstalldirs
+pkglib_DATA = rpmpopt macros/macros cpuinfo.yaml
+
+pkgbindir = $(pkglibdir)/bin
+pkgbin_SCRIPTS = install-sh mkinstalldirs
+
+pkgcfgdir = $(pkglibdir)/macros.d
+pkgcfg_DATA = macros/perl macros/php macros/python
noinst_HEADERS = build.h debug.h system.h
@@ .
rm -f rpm/macros.in <<'@@ .'
Index: rpm/macros.in
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.1 -r1.2 macros.in
--- rpm/macros/macros.in 21 Aug 2009 00:11:24 - 1.1
+++ rpm/macros/macros.in 21 Aug 2009 03:18:37 - 1.2
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.1 2009/08/21 00:11:24 jbj Exp $
+# $Id: macros.in,v 1.2 2009/08/21 03:18:37 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -77,10 +77,7 @@
%__mv@__MV@
%__patch @__PATCH@
%__pax @__PAX@
-%__perl @__PERL@
%__pgp @__PGP@
-%__php @__PHP@
-%__python@__PYTHON@
%__rm@__RM@
%__rsh @__RSH@
%__sed @__SED@
@@ -1616,6 +1613,8 @@
#
%find_lang %{_rpmhome}/find-lang.sh %{buildroot}
+%requires_eq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf
'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/
0:/ /' | grep -v "is not")
+
#
# lua macros
#
@@ -1640,38 +1639,7 @@
%__perl_provides %{_rpmhome}/perl.prov
%__perl_requires %{_rpmhome}/perl.req
-# Useful macros for building *.rpm perl packages.
-#(from Artur Frysiak )
-#
-# For example, these can be used as (from ImageMagick.spec from PLD site)
-#[...]
-#BuildPrereq: perl
-#[...]
-#%package perl
-#Summary: libraries and modules for access to ImageMagick from perl
-#Group: Development/Languages/Perl
-#Requires: %{name} = %{version}
-#%requires_eqperl
-#[...]
-#%install
-#rm -fr $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT/%{perl_sitearch}
-#[...]
-#%files perl
-#%defattr(644,root,root,755)
-#%{perl_sitearch}/Image
-#%dir %{perl_sitearch}/auto/Image
-#
-
-%requires_eq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf
'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/
0:/ /' | grep -v "is not")
-
-%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo
$installsitearch)
-%perl_site
