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: 17-Jun-2007 01:07:08 Branch: rpm-4_5 Handle: 200706162324592529 Modified files: (Branch: rpm-4_5) rpm .cvsignore CHANGES Doxyfile.in Makefile.am configure.ac rpm/lib poptALL.c rpm/scripts Makefile.am Removed files: (Branch: rpm-4_5) rpm gendiff Log: - populate /usr/lib/rpm/@VERSION@/ instead of [EMAIL PROTECTED]@ files. - move gendiff into the scripts directory. - don't include perl/CVS with "make dist". - remove rpmbuild and rpmb helper for now. Summary: Revision Changes Path 1.26.8.2 +3 -0 rpm/.cvsignore 1.1360.2.19 +4 -0 rpm/CHANGES 2.72.2.2 +1 -1 rpm/Doxyfile.in 2.160.2.6 +12 -32 rpm/Makefile.am 2.70.2.13 +3 -7 rpm/configure.ac 2.10 +0 -21 rpm/gendiff 2.28.2.3 +1 -1 rpm/lib/poptALL.c 1.34.2.2 +6 -5 rpm/scripts/Makefile.am ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/.cvsignore ============================================================================ $ cvs diff -u -r1.26.8.1 -r1.26.8.2 .cvsignore --- rpm/.cvsignore 25 May 2007 19:00:34 -0000 1.26.8.1 +++ rpm/.cvsignore 16 Jun 2007 23:07:07 -0000 1.26.8.2 @@ -23,15 +23,18 @@ find-requires find-provides install-sh +intl lib-rpmrc libtool ltconfig ltmain.sh +m4 macros missing platform rpm rpm.spec +rpm5.spec rpmdb rpm[a-z] rpm2cpio @@ . patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1360.2.18 -r1.1360.2.19 CHANGES --- rpm/CHANGES 16 Jun 2007 19:00:09 -0000 1.1360.2.18 +++ rpm/CHANGES 16 Jun 2007 23:07:07 -0000 1.1360.2.19 @@ -1,4 +1,8 @@ 4.4.9 -> 4.5: + - jbj: populate /usr/lib/rpm/@VERSION@/ instead of [EMAIL PROTECTED]@ files. + - jbj: move gendiff into the scripts directory. + - jbj: don't include perl/CVS with "make dist". + - jbj: remove rpmbuild and rpmb helper for now. - jbj: fix plain brown rpm upgrade rpm.spec. - jbj: rescusutate build after cvs server side tree surgery. - skip packages/headers with unverifiable signatures. @@ . patch -p0 <<'@@ .' Index: rpm/Doxyfile.in ============================================================================ $ cvs diff -u -r2.72.2.1 -r2.72.2.2 Doxyfile.in --- rpm/Doxyfile.in 25 May 2007 19:00:34 -0000 2.72.2.1 +++ rpm/Doxyfile.in 16 Jun 2007 23:07:07 -0000 2.72.2.2 @@ -466,7 +466,7 @@ @top_srcdir@/debug.h \ @top_srcdir@/macros \ @top_srcdir@/rpmqv.c \ - @top_srcdir@/[EMAIL PROTECTED]@ \ + @top_srcdir@/rpmpopt \ @top_srcdir@/rpmrc \ @top_srcdir@/system.h \ @top_srcdir@/build/build.c \ @@ . patch -p0 <<'@@ .' Index: rpm/Makefile.am ============================================================================ $ cvs diff -u -r2.160.2.5 -r2.160.2.6 Makefile.am --- rpm/Makefile.am 11 Jun 2007 01:01:04 -0000 2.160.2.5 +++ rpm/Makefile.am 16 Jun 2007 23:07:07 -0000 2.160.2.6 @@ -7,10 +7,16 @@ EXTRA_DIST = 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/* \ + perl/Changes perl/MANIFEST perl/META.yml perl/Makefile.PL \ + perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in 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 \ pubkeys/JBJ-GPG-KEY \ po/*.in po/*.po po/rpm.pot \ - rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c + 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_SYCK_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts doc . @@ -37,20 +43,11 @@ @WITH_ZLIB_LIB@ \ @LIBMISC@ -rpmbindir = `echo $(bindir)` -rpmbin_PROGRAMS = rpm - -bin_SCRIPTS = gendiff +bin_PROGRAMS = rpm pkglibdir = @USRLIBRPM@ -pkglib_PROGRAMS = rpmb -pkglib_DATA = rpmpopt-$(VERSION) macros-$(VERSION) - -rpmpopt-$(VERSION): rpmpopt - cp rpmpopt $@ - -macros-$(VERSION): macros - cp macros $@ +versionlibdir = $(pkglibdir)/@VERSION@ +versionlib_DATA = rpmpopt macros noinst_HEADERS = build.h debug.h system.h @@ -60,12 +57,6 @@ rpm.o: $(top_srcdir)/rpmqv.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) -rpmb_LDADD = rpmb.o $(top_builddir)/build/librpmbuild.la $(myLDADD) -rpmb.o: $(top_srcdir)/rpmqv.c - $(COMPILE) -fpie -DIAM_RPMBT -o $@ -c $< - $(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@ .PHONY: splint @@ -95,10 +86,6 @@ install-data-local: @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm - @rm -f $(DESTDIR)$(pkglibdir)/rpmt - @@LN_S@ rpmb $(DESTDIR)$(pkglibdir)/rpmt - rm -f $(DESTDIR)$(bindir)/rpmbuild - @LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild @for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\ done @@ -145,10 +132,6 @@ .PHONY: setperms setperms: - @for f in $(rpmbin_PROGRAMS) ; do\ - $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(rpmbindir)/$$f ;\ - $(__CHMOD) g+s $(DESTDIR)$(rpmbindir)/$$f ;\ - done @for f in $(bin_PROGRAMS) ; do\ $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(bindir)/$$f ;\ done @@ -167,9 +150,6 @@ .PHONY: unsetgid unsetgid: - @for f in $(rpmbin_PROGRAMS) ; do\ - $(__CHMOD) g-s $(DESTDIR)$(rpmbindir)/$$f ;\ - done @for f in $(pkglib_PROGRAMS) ; do\ $(__CHMOD) g-s $(DESTDIR)$(pkglibdir)/$$f ;\ done @@ -206,7 +186,7 @@ @sudo ./rpm -ta rpm-$(VERSION).tar.gz .PHONY: doxygen -doxygen @WITH_APIDOCS_TARGET@: Doxyfile [EMAIL PROTECTED]@ +doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt macros rm -rf $@ mkdir -p $@ - [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@ @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.70.2.12 -r2.70.2.13 configure.ac --- rpm/configure.ac 16 Jun 2007 18:14:06 -0000 2.70.2.12 +++ rpm/configure.ac 16 Jun 2007 23:07:07 -0000 2.70.2.13 @@ -1480,7 +1480,7 @@ [Full path to rpm system configuration directory (usually /etc/rpm)]) AC_SUBST(SYSCONFIGDIR) -MACROFILES="${USRLIBRPM}/macros-${VERSION}:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros" +MACROFILES="${USRLIBRPM}/${VERSION}/macros:${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) @@ -1490,7 +1490,7 @@ [Colon separated paths of rpmrc files to read.]) AC_SUBST(RPMRCFILES) -RPMPOPTFILE="${USRLIBRPM}/rpmpopt-${VERSION}" +RPMPOPTFILE="${USRLIBRPM}/${VERSION}/rpmpopt" AC_DEFINE_UNQUOTED(RPMPOPTFILE, "$RPMPOPTFILE", [Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt)]) AC_SUBST(RPMPOPTFILE) @@ -1506,13 +1506,9 @@ AC_SUBST(OBJDUMP) -dnl XXX this causes popt to depend on zlib et al -dnl # XXX Propagate -lucb to popt ... -dnl export LIBS INCPATH CONFIG_SITE - AC_CONFIG_SUBDIRS(popt zlib file sqlite db3) -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 rpm5.spec po/Makefile.in rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile scripts/Makefile scripts/macros.perl scripts/macros.php scripts/macros.python @@ . rm -f rpm/gendiff <<'@@ .' Index: rpm/gendiff ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: rpm/lib/poptALL.c ============================================================================ $ cvs diff -u -r2.28.2.2 -r2.28.2.3 poptALL.c --- rpm/lib/poptALL.c 10 Jun 2007 17:12:25 -0000 2.28.2.2 +++ rpm/lib/poptALL.c 16 Jun 2007 23:07:07 -0000 2.28.2.3 @@ -550,7 +550,7 @@ /[EMAIL PROTECTED] [EMAIL PROTECTED]/ (void) poptReadConfigFile(optCon, RPMPOPTFILE); (void) poptReadDefaultConfig(optCon, 1); - poptSetExecPath(optCon, USRLIBRPM, 1); + poptSetExecPath(optCon, USRLIBRPM "/" VERSION, 1); /* Process all options, whine if unknown. */ while ((rc = poptGetNextOpt(optCon)) > 0) { @@ . patch -p0 <<'@@ .' Index: rpm/scripts/Makefile.am ============================================================================ $ cvs diff -u -r1.34.2.1 -r1.34.2.2 Makefile.am --- rpm/scripts/Makefile.am 10 Jun 2007 17:12:35 -0000 1.34.2.1 +++ rpm/scripts/Makefile.am 16 Jun 2007 23:07:08 -0000 1.34.2.2 @@ -9,7 +9,7 @@ check-files cross-build executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ cpanflute cpanflute2 Specfile.pm find-provides.perl \ - find-requires.perl freshen.sh getpo.sh http.req \ + find-requires.perl freshen.sh gendiff getpo.sh http.req \ check-java-closure.sh java.prov.sh java.req.sh \ javadeps.sh libtooldeps.sh pkgconfigdeps.sh \ perldeps.pl perl.prov perl.req pythondeps.sh \ @@ -25,17 +25,18 @@ all: -bin_SCRIPTS = rpm2cpio +bin_SCRIPTS = gendiff rpm2cpio -configdir = ${prefix}/lib/rpm -config_SCRIPTS = \ +pkglibdir = @USRLIBRPM@ +versionlibdir = $(pkglibdir)/@VERSION@ +versionlib_SCRIPTS = \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note brp-nobuildrootpath \ brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ check-files cross-build executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ find-provides.perl \ - find-requires.perl getpo.sh http.req \ + find-requires.perl gendiff getpo.sh http.req \ javadeps.sh libtooldeps.sh pkgconfigdeps.sh \ perldeps.pl perl.prov perl.req pythondeps.sh \ php.prov php.req \ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org