[svn] r5467 - in trunk/rpms: . rpm5
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Jun 1 21:44:01 CEST 2007
Author: dries
Date: 2007-06-01 21:43:59 +0200 (Fri, 01 Jun 2007)
New Revision: 5467
Added:
trunk/rpms/rpm5/
trunk/rpms/rpm5/rpm5-add-5-suffix.patch
trunk/rpms/rpm5/rpm5.spec
Log:
spec file for parallel installable 4.5 version of rpm, work in progress
Added: trunk/rpms/rpm5/rpm5-add-5-suffix.patch
===================================================================
--- trunk/rpms/rpm5/rpm5-add-5-suffix.patch (rev 0)
+++ trunk/rpms/rpm5/rpm5-add-5-suffix.patch 2007-06-01 19:43:59 UTC (rev 5467)
@@ -0,0 +1,717 @@
+diff -ur rpm-4.5-orig/build/Makefile.am rpm-4.5-ok/build/Makefile.am
+--- rpm-4.5-orig/build/Makefile.am 2007-05-25 19:35:56.000000000 +0200
++++ rpm-4.5-ok/build/Makefile.am 2007-06-01 20:51:58.000000000 +0200
+@@ -27,20 +27,20 @@
+ LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+
+ usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmbuild.la
+-librpmbuild_la_SOURCES = \
++usrlib_LTLIBRARIES = librpmbuild5.la
++librpmbuild5_la_SOURCES = \
+ build.c expression.c files.c misc.c names.c pack.c \
+ parseBuildInstallClean.c parseChangelog.c parseDescription.c \
+ parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
+ parseSpec.c poptBT.c reqprov.c spec.c
+-librpmbuild_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
+- $(top_builddir)/lib/librpm.la \
+- $(top_builddir)/rpmdb/librpmdb.la \
+- $(top_builddir)/rpmio/librpmio.la \
++librpmbuild5_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
++ $(top_builddir)/lib/librpm5.la \
++ $(top_builddir)/rpmdb/librpmdb5.la \
++ $(top_builddir)/rpmio/librpmio5.la \
+ @WITH_LIBELF_LIB@
+
+ if HAVE_LD_VERSION_SCRIPT
+-librpmbuild_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmbuild.vers
++librpmbuild5_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmbuild.vers
+ endif
+
+ rpmfile.h:
+@@ -54,12 +54,12 @@
+ #BUILT_SOURCES = rpmbuild.lcd
+
+ rpmbuild.lcd: Makefile.am ${librpmbuild_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
+- -lclint ${DEFS} ${INCLUDES} ${librpmbuild_la_SOURCES} -dump $@ 2>/dev/null
++ -lclint ${DEFS} ${INCLUDES} ${librpmbuild5_la_SOURCES} -dump $@ 2>/dev/null
+
+ .PHONY: sources
+ sources:
+- @echo $(librpmbuild_la_SOURCES:%=build/%)
++ @echo $(librpmbuild5_la_SOURCES:%=build/%)
+
+ .PHONY: lint
+ lint:
+- $(LINT) ${DEFS} ${INCLUDES} ${librpmbuild_la_SOURCES}
++ $(LINT) ${DEFS} ${INCLUDES} ${librpmbuild5_la_SOURCES}
+Only in rpm-4.5-ok/build: Makefile.am~
+Only in rpm-4.5-ok/build: Makefile.am.orig
+Only in rpm-4.5-ok/build: Makefile.am.rej
+diff -ur rpm-4.5-orig/configure.ac rpm-4.5-ok/configure.ac
+--- rpm-4.5-orig/configure.ac 2007-05-25 21:55:03.000000000 +0200
++++ rpm-4.5-ok/configure.ac 2007-06-01 20:49:59.000000000 +0200
+@@ -651,13 +651,13 @@
+ if test -d popt ; then
+ WITH_POPT_SUBDIR=popt
+ WITH_POPT_INCLUDE="-I\${top_srcdir}/${WITH_POPT_SUBDIR}"
+- WITH_POPT_LIB="\${top_builddir}/${WITH_POPT_SUBDIR}/libpopt.la"
++ WITH_POPT_LIB="\${top_builddir}/${WITH_POPT_SUBDIR}/libpopt5.la"
+ else
+ AC_CHECK_HEADER([popt.h], [
+ AC_CHECK_LIB(popt, poptGetContext, [
+ WITH_POPT_SUBDIR=
+ WITH_POPT_INCLUDE=
+- WITH_POPT_LIB="-lpopt"
++ WITH_POPT_LIB="-lpopt5"
+ ])
+ ])
+ fi
+@@ -1466,12 +1466,12 @@
+ AC_SUBST(LOCALEDIR)
+ LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
+ AC_SUBST(LIBDIR)
+-USRLIBRPM="`echo ${usrprefix}/lib/rpm`"
++USRLIBRPM="`echo ${usrprefix}/lib/rpm5`"
+ AC_DEFINE_UNQUOTED(USRLIBRPM, "$USRLIBRPM",
+ [Full path to rpm global configuration directory (usually /usr/lib/rpm)])
+ AC_SUBST(USRLIBRPM)
+
+-SYSCONFIGDIR="`echo /etc/rpm`"
++SYSCONFIGDIR="`echo /etc/rpm5`"
+ AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR",
+ [Full path to rpm system configuration directory (usually /etc/rpm)])
+ AC_SUBST(SYSCONFIGDIR)
+diff -ur rpm-4.5-orig/db3/configure rpm-4.5-ok/db3/configure
+--- rpm-4.5-orig/db3/configure 2007-05-25 19:35:57.000000000 +0200
++++ rpm-4.5-ok/db3/configure 2007-06-01 20:50:08.000000000 +0200
+@@ -23,6 +23,7 @@
+ distdir install check:\
+ \
+ db4_install: all install_setip' > Makefile
++perl -pi -e "s|^libdb_base=.*|libdb_base= libdb5|g;" Makefile
+
+ mv db.h db.h.orig
+ cat db.h.orig | sed \
+diff -ur rpm-4.5-orig/lib/Makefile.am rpm-4.5-ok/lib/Makefile.am
+--- rpm-4.5-orig/lib/Makefile.am 2007-05-25 19:36:02.000000000 +0200
++++ rpm-4.5-ok/lib/Makefile.am 2007-06-01 20:49:59.000000000 +0200
+@@ -27,14 +27,14 @@
+ noinst_HEADERS = \
+ cpio.h fsm.h manifest.h psm.h rpmlead.h rpmlock.h signature.h tar.h
+
+-mylibs = librpm.la
++mylibs = librpm5.la
+ LIBS =
+
+ LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+
+ usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpm.la
+-librpm_la_SOURCES = \
++usrlib_LTLIBRARIES = librpm5.la
++librpm5_la_SOURCES = \
+ cpio.c depends.c formats.c fs.c fsm.c getdate.c \
+ manifest.c misc.c package.c \
+ poptALL.c poptI.c poptQV.c psm.c query.c \
+@@ -43,15 +43,15 @@
+ rpmlead.c rpmlock.c rpmns.c rpmps.c rpmrc.c rpmsx.c rpmte.c rpmts.c \
+ signature.c stringbuf.c transaction.c \
+ verify.c tar.c
+-librpm_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
+- $(top_builddir)/rpmdb/librpmdb.la \
+- $(top_builddir)/rpmio/librpmio.la \
++librpm5_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
++ $(top_builddir)/rpmdb/librpmdb5.la \
++ $(top_builddir)/rpmio/librpmio5.la \
+ @WITH_POPT_LIB@ \
+ @WITH_SELINUX_LIB@ \
+ @LTLIBINTL@
+
+ if HAVE_LD_VERSION_SCRIPT
+-librpm_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpm.vers
++librpm5_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpm.vers
+ endif
+
+ getdate.c: getdate.y
+@@ -87,13 +87,13 @@
+
+ BUILT_SOURCES = getdate.c # rpmlib.lcd
+
+-rpmlib.lcd: Makefile.am ${librpm_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
+- -lclint ${DEFS} ${INCLUDES} ${librpm_la_SOURCES} -dump $@ 2>/dev/null
++rpmlib.lcd: Makefile.am ${librpm5_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
++ -lclint ${DEFS} ${INCLUDES} ${librpm5_la_SOURCES} -dump $@ 2>/dev/null
+
+ .PHONY: sources
+ sources:
+- @echo $(librpm_la_SOURCES:%=lib/%)
++ @echo $(librpm5_la_SOURCES:%=lib/%)
+
+ .PHONY: lint
+ lint:
+- $(LINT) $(DEFS) $(INCLUDES) $(librpm_la_SOURCES)
++ $(LINT) $(DEFS) $(INCLUDES) $(librpm5_la_SOURCES)
+diff -ur rpm-4.5-orig/Makefile.am rpm-4.5-ok/Makefile.am
+--- rpm-4.5-orig/Makefile.am 2007-05-25 21:55:03.000000000 +0200
++++ rpm-4.5-ok/Makefile.am 2007-06-01 20:49:59.000000000 +0200
+@@ -30,20 +30,20 @@
+ myLDFLAGS = @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
+
+ myLDADD = \
+- $(top_builddir)/lib/librpm.la \
+- $(top_builddir)/rpmdb/librpmdb.la \
+- $(top_builddir)/rpmio/librpmio.la \
++ $(top_builddir)/lib/librpm5.la \
++ $(top_builddir)/rpmdb/librpmdb5.la \
++ $(top_builddir)/rpmio/librpmio5.la \
+ @WITH_POPT_LIB@ \
+ @WITH_ZLIB_LIB@ \
+ @LIBMISC@
+
+ rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
+-rpmbin_PROGRAMS = rpm
++rpmbin_PROGRAMS = rpm5
+
+-bin_SCRIPTS = gendiff
++bin_SCRIPTS = gendiff5
+
+ pkglibdir = @USRLIBRPM@
+-pkglib_PROGRAMS = rpmb rpmd rpmi rpmk rpmq
++pkglib_PROGRAMS = rpmb5 rpmd5 rpmi5 rpmk5 rpmq5
+ pkglib_DATA = rpmrc rpmpopt-$(VERSION) macros
+ pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \
+ config.guess config.sub config.site
+@@ -53,44 +53,44 @@
+
+ noinst_HEADERS = build.h debug.h system.h
+
+-rpm_SOURCES =
+-rpm_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
+-rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD)
++rpm5_SOURCES =
++rpm5_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
++rpm5_LDADD = rpm5.o $(top_builddir)/build/.libs/librpmbuild5.a $(myLDADD)
+ #rpm_LDFLAGS = $(myLDFLAGS)
+ #rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD)
+-rpm.o: $(top_srcdir)/rpmqv.c
++rpm5.o: $(top_srcdir)/rpmqv.c
+ $(COMPILE) -fpie -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
++rpmb5_SOURCES = $(top_srcdir)/build.c
++rpmb5_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
++rpmb5_LDADD = rpmb5.o $(top_builddir)/build/librpmbuild5.la $(myLDADD)
++rpmb5.o: $(top_srcdir)/rpmqv.c
+ $(COMPILE) -fpie -DIAM_RPMBT -o $@ -c $<
+
+-rpmd_SOURCES =
+-rpmd_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
+-rpmd_LDADD = rpmd.o $(myLDADD)
+-rpmd.o: $(top_srcdir)/rpmqv.c
++rpmd5_SOURCES =
++rpmd5_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
++rpmd5_LDADD = rpmd5.o $(myLDADD)
++rpmd5.o: $(top_srcdir)/rpmqv.c
+ $(COMPILE) -fpie -DIAM_RPMDB -o $@ -c $<
+
+-rpmi_SOURCES =
+-rpmi_LDFLAGS = $(myLDFLAGS) # $(staticLDFLAGS)
+-rpmi_LDADD = rpmi.o $(myLDADD)
++rpmi5_SOURCES =
++rpmi5_LDFLAGS = $(myLDFLAGS) # $(staticLDFLAGS)
++rpmi5_LDADD = rpmi5.o $(myLDADD)
+ #rpmi_LDFLAGS = $(myLDFLAGS)
+ #rpmi_LDADD = rpmi.o $(myLDADD)
+-rpmi.o: $(top_srcdir)/rpmqv.c
++rpmi5.o: $(top_srcdir)/rpmqv.c
+ $(COMPILE) -fpie -DIAM_RPMEIU -o $@ -c $<
+
+-rpmk_SOURCES =
+-rpmk_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
+-rpmk_LDADD = rpmk.o $(myLDADD)
+-rpmk.o: $(top_srcdir)/rpmqv.c
++rpmk5_SOURCES =
++rpmk5_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
++rpmk5_LDADD = rpmk5.o $(myLDADD)
++rpmk5.o: $(top_srcdir)/rpmqv.c
+ $(COMPILE) -fpie -DIAM_RPMK -o $@ -c $<
+
+-rpmq_SOURCES =
+-rpmq_LDFLAGS = $(myLDFLAGS) # $(staticLDFLAGS)
+-rpmq_LDADD = rpmq.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
+-rpmq.o: $(top_srcdir)/rpmqv.c
++rpmq5_SOURCES =
++rpmq5_LDFLAGS = $(myLDFLAGS) # $(staticLDFLAGS)
++rpmq5_LDADD = rpmq5.o $(top_builddir)/build/librpmbuild5.la $(myLDADD)
++rpmq5.o: $(top_srcdir)/rpmqv.c
+ $(COMPILE) -fpie -DIAM_RPMQV -o $@ -c $<
+
+ $(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@
+@@ -121,28 +121,28 @@
+ pkgsrcdir = $(prefix)/src/rpm
+
+ install-data-local:
+- @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
++ @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm5
+ @rm -f $(DESTDIR)$(pkglibdir)/rpmt
+ @@LN_S@ rpmb $(DESTDIR)$(pkglibdir)/rpmt
+- @rm -f $(DESTDIR)$(pkglibdir)/rpme
++ @rm -f $(DESTDIR)$(pkglibdir)/rpme5
+ @@LN_S@ rpmi $(DESTDIR)$(pkglibdir)/rpme
+ @rm -f $(DESTDIR)$(pkglibdir)/rpmu
+ @@LN_S@ rpmi $(DESTDIR)$(pkglibdir)/rpmu
+ @rm -f $(DESTDIR)$(pkglibdir)/rpmv
+ @@LN_S@ rpmq $(DESTDIR)$(pkglibdir)/rpmv
+- rm -f $(DESTDIR)$(bindir)/rpmbuild
+- @LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild
+- rm -f $(DESTDIR)$(bindir)/rpmquery
+- @LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery
+- rm -f $(DESTDIR)$(bindir)/rpmverify
+- @LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify
+- rm -f $(DESTDIR)$(bindir)/rpmsign
+- @LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign
+- rm -f $(DESTDIR)$(bindir)/rpmdb ; \
+- @LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
++ rm -f $(DESTDIR)$(bindir)/rpmbuild5
++ @LN_S@ ../lib/rpm5/rpmb $(DESTDIR)$(bindir)/rpmbuild5
++ rm -f $(DESTDIR)$(bindir)/rpmquery5
++ @LN_S@ ../lib/rpm5/rpmq $(DESTDIR)$(bindir)/rpmquery5
++ rm -f $(DESTDIR)$(bindir)/rpmverify5
++ @LN_S@ ../lib/rpm5/rpmv $(DESTDIR)$(bindir)/rpmverify5
++ rm -f $(DESTDIR)$(bindir)/rpmsign5
++ @LN_S@ ../lib/rpm5/rpmk $(DESTDIR)$(bindir)/rpmsign5
++ rm -f $(DESTDIR)$(bindir)/rpmdb5 ; \
++ @LN_S@ ../lib/rpm5/rpmd $(DESTDIR)$(bindir)/rpmdb5 ; \
+ for bf in e i u ; do \
+- rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
+- @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
++ rm -f $(DESTDIR)$(bindir)/rpm$$bf5 ; \
++ @LN_S@ ../lib/rpm5/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf5 ; \
+ done
+ @for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
+ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
+diff -ur rpm-4.5-orig/popt/Makefile.am rpm-4.5-ok/popt/Makefile.am
+--- rpm-4.5-orig/popt/Makefile.am 2007-05-25 21:00:38.000000000 +0200
++++ rpm-4.5-ok/popt/Makefile.am 2007-06-01 20:49:59.000000000 +0200
+@@ -36,25 +36,25 @@
+ include_HEADERS = popt.h
+
+ usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = libpopt.la
++usrlib_LTLIBRARIES = libpopt5.la
+
+-libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
+-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ # @LTLIBICONV@
++libpopt5_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
++libpopt5_la_LDFLAGS = -no-undefined @LTLIBINTL@ # @LTLIBICONV@
+
+ if HAVE_LD_VERSION_SCRIPT
+-libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
++libpopt5_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
+ endif
+
+ man_MANS = popt.3
+
+ #BUILT_SOURCES = popt.lcd
+
+-popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
+- lclint -dump $@ ${libpopt_la_SOURCES}
++popt.lcd: Makefile.am ${libpopt5_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
++ lclint -dump $@ ${libpopt5_la_SOURCES}
+
+ .PHONY: sources
+ sources:
+- @echo $(libpopt_la_SOURCES:%=popt/%)
++ @echo $(libpopt5_la_SOURCES:%=popt/%)
+
+ .PHONY: lint
+ lint:
+diff -ur rpm-4.5-orig/python/Makefile.am rpm-4.5-ok/python/Makefile.am
+--- rpm-4.5-orig/python/Makefile.am 2007-05-25 19:36:31.000000000 +0200
++++ rpm-4.5-ok/python/Makefile.am 2007-06-01 20:49:59.000000000 +0200
+@@ -30,22 +30,22 @@
+ spec-py.h
+
+ mylibs= \
+- $(top_builddir)/build/librpmbuild.la \
+- $(top_builddir)/lib/librpm.la \
+- $(top_builddir)/rpmdb/librpmdb.la \
+- $(top_builddir)/rpmio/librpmio.la \
++ $(top_builddir)/build/librpmbuild5.la \
++ $(top_builddir)/lib/librpm5.la \
++ $(top_builddir)/rpmdb/librpmdb5.la \
++ $(top_builddir)/rpmio/librpmio5.la \
+ @WITH_POPT_LIB@ \
+ @WITH_LIBELF_LIB@
+
+ LDADD =
+
+ rpmdir = $(pylibdir)/site-packages/rpm
+-rpm_LTLIBRARIES = _rpmmodule.la
++rpm_LTLIBRARIES = _rpmmodule5.la
+
+-_rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
+-_rpmmodule_la_LIBADD = @WITH_BEECRYPT_LIB@
++_rpmmodule5_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
++_rpmmodule5_la_LIBADD = @WITH_BEECRYPT_LIB@
+
+-_rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
++_rpmmodule5_la_SOURCES = rpmmodule.c header-py.c \
+ rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
+ rpmfi-py.c rpmmi-py.c rpmps-py.c rpmrc-py.c rpmte-py.c \
+ rpmts-py.c spec-py.c
+diff -ur rpm-4.5-orig/rpmdb/Makefile.am rpm-4.5-ok/rpmdb/Makefile.am
+--- rpm-4.5-orig/rpmdb/Makefile.am 2007-05-25 19:36:33.000000000 +0200
++++ rpm-4.5-ok/rpmdb/Makefile.am 2007-06-01 20:49:59.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ tjfn_SOURCES = tjfn.c
+ tjfn_LDFLAGS = @LDFLAGS_STATIC@
+-tjfn_LDADD = librpmdb.la
++tjfn_LDADD = librpmdb5.la
+
+ pkgincdir = $(pkgincludedir)
+ pkginc_HEADERS = db.h header.h hdrinline.h rpmdb.h
+@@ -34,33 +34,33 @@
+ rpmdb_hotbackup rpmdb_load rpmdb_printlog rpmdb_recover \
+ rpmdb_svc rpmdb_stat rpmdb_upgrade rpmdb_verify
+
+-mylibs = librpmdb.la
++mylibs = librpmdb5.la
+
+ LIBS =
+
+ # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
+-libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
++libdb5_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
+
+ # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
+ LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+
+ usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmdb.la
+-librpmdb_la_SOURCES = \
++usrlib_LTLIBRARIES = librpmdb5.la
++librpmdb5_la_SOURCES = \
+ dbconfig.c fprint.c \
+ hdrNVR.c header.c header_internal.c legacy.c merge.c \
+ poptDB.c rpmdb.c \
+ tagname.c tagtbl.c
+-librpmdb_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) \
+- $(top_builddir)/rpmio/librpmio.la \
++librpmdb5_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) \
++ $(top_builddir)/rpmio/librpmio5.la \
+ @WITH_POPT_LIB@ \
+ @WITH_SQLITE3_LIB@ \
+ @WITH_LIBELF_LIB@
+-librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
+-librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
++librpmdb5_la_LIBADD = $(DBLIBOBJS) $(libdb5_la)
++librpmdb5_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb5_la)
+
+ if HAVE_LD_VERSION_SCRIPT
+-librpmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmdb.vers
++librpmdb5_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmdb.vers
+ endif
+
+ # XXX make sure that db.h symlink is generated
+@@ -92,48 +92,48 @@
+ @ln -sf ../$(WITH_DB_SUBDIR)/db.h $@
+
+ # XXX grrr, force noinst libdb.la for db3.
+-$(libdb_la):
+- sed -e"/^libdir=/s/^.*$$/libdir=''/" < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.5.la > $(libdb_la)
++$(libdb5_la):
++ sed -e"/^libdir=/s/^.*$$/libdir=''/" < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb5-4.5.la > $(libdb5_la)
+
+ rpmdb_archive_SOURCES =
+ rpmdb_archive_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_archive.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_checkpoint_SOURCES =
+ rpmdb_checkpoint_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_checkpoint.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_deadlock_SOURCES =
+ rpmdb_deadlock_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_deadlock.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_dump_SOURCES =
+ rpmdb_dump_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_dump.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_hotbackup_SOURCES =
+ rpmdb_hotbackup_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_hotbackup.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_load_SOURCES =
+ rpmdb_load_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_load.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_printlog_SOURCES =
+ rpmdb_printlog_LDADD = \
+@@ -148,21 +148,21 @@
+ $(top_builddir)/$(WITH_DB_SUBDIR)/rep_autop.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/txn_autop.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_recover_SOURCES =
+ rpmdb_recover_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_recover.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_stat_SOURCES =
+ rpmdb_stat_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_stat.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_svc_SOURCES =
+ rpmdb_svc_LDADD = \
+@@ -172,55 +172,55 @@
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_xdr.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/gen_db_server.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_upgrade_SOURCES =
+ rpmdb_upgrade_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_upgrade.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ rpmdb_verify_SOURCES =
+ rpmdb_verify_LDADD = \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/db_verify.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
+ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
+- librpmdb.la
++ librpmdb5.la
+
+ clean-local:
+ rm -f *.o db.h $(libdb_la)
+
+ BUILT_SOURCES = tagtbl.c
+
+-rpmdb.lcd: Makefile.am ${librpmdb_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
++rpmdb.lcd: Makefile.am ${librpmdb5_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
+ -splint ${DEFS} ${INCLUDES} ${librpmdb_la_SOURCES} -dump $@ 2>/dev/null
+
+ .PHONY: sources
+ sources:
+- @echo $(librpmdb_la_SOURCES:%=rpmdb/%)
++ @echo $(librpmdb5_la_SOURCES:%=rpmdb/%)
+
+ .PHONY: lint
+ lint:
+ $(LINT) $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES) $(DBLIBSRCS)
+
+-tdbi: tdbi.o librpmdb.la
++tdbi: tdbi.o librpmdb5.la
+ $(LINK) @LDFLAGS_STATIC@ -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
+
+-tdpkg: tdpkg.o librpmdb.la
++tdpkg: tdpkg.o librpmdb5.la
+ $(LINK) @LDFLAGS_STATIC@ -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
+
+-tmpkg: tmpkg.o librpmdb.la
++tmpkg: tmpkg.o librpmdb5.la
+ $(LINK) @LDFLAGS_STATIC@ -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
+
+-tsql: tsql.o librpmdb.la
++tsql: tsql.o librpmdb5.la
+ $(LINK) @LDFLAGS_STATIC@ -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
+
+-tpkgadd: tpkgadd.o librpmdb.la
++tpkgadd: tpkgadd.o librpmdb5.la
+ $(LINK) @LDFLAGS_STATIC@ -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
+
+-trepomd: trepomd.o librpmdb.la
++trepomd: trepomd.o librpmdb5.la
+ $(LINK) @LDFLAGS_STATIC@ -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
+
+-ttag: ttag.o librpmdb.la
++ttag: ttag.o librpmdb5.la
+ $(LINK) @LDFLAGS_STATIC@ -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
+diff -ur rpm-4.5-orig/rpmio/Makefile.am rpm-4.5-ok/rpmio/Makefile.am
+--- rpm-4.5-orig/rpmio/Makefile.am 2007-05-25 21:00:39.000000000 +0200
++++ rpm-4.5-ok/rpmio/Makefile.am 2007-06-01 20:49:59.000000000 +0200
+@@ -33,8 +33,8 @@
+ LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+
+ usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmio.la
+-librpmio_la_SOURCES = \
++usrlib_LTLIBRARIES = librpmio5.la
++librpmio5_la_SOURCES = \
+ argv.c digest.c fts.c getpass.c macro.c mire.c \
+ md2.c md4.c rmd128.c rmd160.c rmd256.c rmd320.c sha224.c \
+ salsa10.c salsa20.c tiger.c \
+@@ -42,7 +42,7 @@
+ rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c strtolocale.c \
+ stubs.c url.c ugid.c \
+ LzmaDecode.c
+-librpmio_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
++librpmio5_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
+ @WITH_BEECRYPT_LIB@ \
+ @WITH_NEON_LIB@ \
+ @WITH_LUA_LIB@ \
+@@ -52,11 +52,11 @@
+ @WITH_ZLIB_LIB@ \
+ -lpthread \
+ @LTLIBINTL@
+-librpmio_la_LIBADD = # $(BEECRYPTLOBJS)
+-librpmio_la_DEPENDENCIES = # .created
++librpmio5_la_LIBADD = # $(BEECRYPTLOBJS)
++librpmio5_la_DEPENDENCIES = # .created
+
+ if HAVE_LD_VERSION_SCRIPT
+-librpmio_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmio.vers
++librpmio5_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmio.vers
+ endif
+
+ .created:
+@@ -73,64 +73,64 @@
+
+ #BUILT_SOURCES = rpmio.lcd
+
+-rpmio.lcd: Makefile.am ${librpmio_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
+- -lclint -load ../beecrypt/beecrypt.lcd $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) -dump $@ 2>/dev/null
++rpmio.lcd: Makefile.am ${librpmio5_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
++ -lclint -load ../beecrypt/beecrypt.lcd $(DEFS) $(INCLUDES) $(librpmio5_la_SOURCES) -dump $@ 2>/dev/null
+
+ .PHONY: sources
+ sources:
+- @echo $(librpmio_la_SOURCES:%=rpmio/%)
++ @echo $(librpmio5_la_SOURCES:%=rpmio/%)
+
+ .PHONY: lint
+ lint:
+- $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
++ $(LINT) $(DEFS) $(INCLUDES) $(librpmio5_la_SOURCES)
+
+ tax_SOURCES = tax.c
+-tax_LDADD = librpmio.la
++tax_LDADD = librpmio5.la
+
+ tdir_SOURCES = tdir.c
+ tdir_LDFLAGS = @LDFLAGS_STATIC@
+-tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tdir_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+ tfts_SOURCES = tfts.c
+ tfts_LDFLAGS = @LDFLAGS_STATIC@
+-tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tfts_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+ tget_SOURCES = tget.c
+ tget_LDFLAGS = @LDFLAGS_STATIC@
+-tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tget_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+ thkp_SOURCES = thkp.c
+ thkp_LDFLAGS = @LDFLAGS_STATIC@
+-thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++thkp_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+ tput_SOURCES = tput.c
+ tput_LDFLAGS = @LDFLAGS_STATIC@
+-tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tput_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+
+ tglob_SOURCES = tglob.c
+ tglob_LDFLAGS = @LDFLAGS_STATIC@
+-tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tglob_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+ tinv_SOURCES = tinv.c
+ tinv_LDFLAGS = @LDFLAGS_STATIC@
+-tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tinv_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+ tkey_SOURCES = tkey.c
+ tkey_LDFLAGS = @LDFLAGS_STATIC@
+-tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tkey_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+ trpmio_SOURCES = trpmio.c
+-trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++trpmio_LDADD = librpmio5.la $(top_builddir)/popt/libpopt5.la
+
+ tsw_SOURCES = tsw.c
+-tsw_LDFLAGS = librpmio.la
++tsw_LDFLAGS = librpmio5.la
+
+ dumpasn1_SOURCES = dumpasn1.c
+
+ lookup3_SOURCES = lookup3.c
+ lookup3_CFLAGS = $(CFLAGS) -D_JLU3_SELFTEST
+-lookup3_LDADD = librpmio.la
++lookup3_LDADD = librpmio5.la
+
+ tficl.o: tficl.c
+ $(COMPILE) -I/usr/include/ficl -o $@ -c tficl.c
+diff -ur rpm-4.5-orig/scripts/Makefile.am rpm-4.5-ok/scripts/Makefile.am
+--- rpm-4.5-orig/scripts/Makefile.am 2007-05-25 19:36:39.000000000 +0200
++++ rpm-4.5-ok/scripts/Makefile.am 2007-06-01 20:49:59.000000000 +0200
+@@ -25,9 +25,9 @@
+
+ all:
+
+-bin_SCRIPTS = rpm2cpio
++bin_SCRIPTS = rpm2cpio5
+
+-configdir = ${prefix}/lib/rpm
++configdir = ${prefix}/lib/rpm5
+ config_SCRIPTS = \
+ brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \
+ brp-strip brp-strip-comment-note brp-nobuildrootpath \
+diff -ur rpm-4.5-orig/tools/Makefile.am rpm-4.5-ok/tools/Makefile.am
+--- rpm-4.5-orig/tools/Makefile.am 2007-05-25 19:36:41.000000000 +0200
++++ rpm-4.5-ok/tools/Makefile.am 2007-06-01 20:49:59.000000000 +0200
+@@ -19,7 +19,7 @@
+
+ EXTRA_PROGRAMS = debugedit convertdb1
+
+-LDADD = $(top_builddir)/lib/librpm.la
++LDADD = $(top_builddir)/lib/librpm5.la
+
+ pkgbindir = @USRLIBRPM@
+ pkgbin_PROGRAMS = rpmdeps @WITH_LIBDWARF_DEBUGEDIT@
Added: trunk/rpms/rpm5/rpm5.spec
===================================================================
--- trunk/rpms/rpm5/rpm5.spec (rev 0)
+++ trunk/rpms/rpm5/rpm5.spec 2007-06-01 19:43:59 UTC (rev 5467)
@@ -0,0 +1,582 @@
+# $Id$
+# Authority: dries
+# Upstream: Jeff Johnson <n3npq$mac,com>
+
+# Tag: test
+
+
+%define with_python_subpackage 1%{nil}
+# python version 2.5 => 2.4 for fc6 (dries)
+%define with_python_version 2.4%{nil}
+%define with_perl_subpackage 1%{nil}
+%define with_bzip2 1%{nil}
+%define with_apidocs 1%{nil}
+%define rpm_version 4.5
+
+%{!?_usrlibrpm:%define _usrlibrpm /usr/lib/rpm5}
+
+# Autogenerate shell script dependencies.
+#%%define __executable_requires %{_usrlibrpm}/executabledeps.sh --requires
+
+# XXX legacy requires './' payload prefix to be omitted from rpm packages.
+%define _noPayloadPrefix 1
+
+%define __prefix %{?_prefix}%{!?_prefix:/usr}
+%{?!_lib: %define _lib lib}
+%{expand: %%define __share %(if [ -d %{__prefix}/share/man ]; then echo /share ; else echo %%{nil} ; fi)}
+
+
+Summary: The RPM package management system.
+Name: rpm5
+Version: %{rpm_version}
+Release: 0.3
+Group: System Environment/Base
+URL: http://wraptastic.org
+Source: http://rpm5.org/files/rpm/rpm-4.5/rpm-%{version}.tar.gz
+Patch: rpm5-add-5-suffix.patch
+License: LGPL
+%ifos linux
+Prereq: fileutils shadow-utils
+%endif
+Requires: getconf(GNU_LIBPTHREAD_VERSION) = NPTL
+
+# XXX necessary only to drag in /usr/lib/libelf.a, otherwise internal elfutils.
+#not available in fc6 (dries) - BuildRequires: rpm >= 4.4.7
+BuildRequires: elfutils-libelf
+BuildRequires: elfutils-devel
+BuildRequires: zlib-devel
+
+BuildRequires: beecrypt-devel >= 4.1.2
+Requires: beecrypt >= 4.1.2
+
+BuildRequires: neon-devel
+BuildRequires: sqlite-devel
+
+%if %{with_bzip2}
+BuildRequires: bzip2-devel >= 0.9.0c-2
+%endif
+%if %{with_python_subpackage}
+BuildRequires: python-devel >= %{with_python_version}
+%endif
+%if %{with_perl_subpackage}
+BuildRequires: perl >= 2:5.8.0
+%endif
+
+BuildRoot: %{_tmppath}/%{name}-root
+
+%description
+The RPM Package Manager (RPM) is a powerful command line driven
+package management system capable of installing, uninstalling,
+verifying, querying, and updating software packages. Each software
+package consists of an archive of files along with information about
+the package like its version, a description, etc.
+
+%package libs
+Summary: Libraries for manipulating RPM packages.
+Group: Development/Libraries
+# XXX this Provides: is bogus, but getconf(...) needs to be bootstrapped.
+Provides: getconf(GNU_LIBPTHREAD_VERSION) = NPTL
+Requires: getconf(GNU_LIBPTHREAD_VERSION) = NPTL
+
+%description libs
+This package contains the RPM shared libraries.
+
+%package devel
+Summary: Development files for manipulating RPM packages.
+Group: Development/Libraries
+Requires: rpm = %{version}-%{release}
+Requires: rpm-libs = %{version}-%{release}
+Requires: beecrypt >= 4.1.2
+Requires: neon-devel
+Requires: sqlite-devel
+Requires: getconf(GNU_LIBPTHREAD_VERSION) = NPTL
+
+%description devel
+This package contains the RPM C library and header files. These
+development files will simplify the process of writing programs that
+manipulate RPM packages and databases. These files are intended to
+simplify the process of creating graphical package managers or any
+other tools that need an intimate knowledge of RPM packages in order
+to function.
+
+This package should be installed if you want to develop programs that
+will manipulate RPM packages and databases.
+
+%package build
+Summary: Scripts and executable programs used to build packages.
+Group: Development/Tools
+Requires: rpm = %{version}-%{release}, patch >= 2.5
+Requires: getconf(GNU_LIBPTHREAD_VERSION) = NPTL
+
+%description build
+The rpm-build package contains the scripts and executable programs
+that are used to build packages using the RPM Package Manager.
+
+%if %{with_python_subpackage}
+%package python
+Summary: Python bindings for apps which will manipulate RPM packages.
+Group: Development/Libraries
+Requires: rpm = %{version}-%{release}
+Requires: rpm-libs = %{version}-%{release}
+Requires: python >= %{with_python_version}
+
+%description python
+The rpm-python package contains a module that permits applications
+written in the Python programming language to use the interface
+supplied by RPM Package Manager libraries.
+
+This package should be installed if you want to develop Python
+programs that will manipulate RPM packages and databases.
+%endif
+
+%if %{with_perl_subpackage}
+%package perl
+Summary: Perl bindings for apps which will manipulate RPM packages.
+Group: Development/Libraries
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.17
+Requires: rpm = %{version}-%{release}
+Requires: rpm-libs = %{version}-%{release}
+Obsoletes: perl-RPM, perl-RPM2
+Conflicts: perl-RPM, perl-RPM2
+
+%description perl
+The rpm-perl package contains a module that permits applications
+written in the Perl programming language to use the interface
+supplied by RPM Package Manager libraries.
+
+This package should be installed if you want to develop Perl
+programs that will manipulate RPM packages and databases.
+
+(Note: rpm-perl is forked from perl-RPM2-0.66, and will obsolete existing perl-RPM packages)
+%endif
+
+%package -n popt5
+Summary: A C library for parsing command line parameters.
+Group: Development/Libraries
+Version: 1.11
+
+%description -n popt5
+Popt is a C library for parsing command line parameters. Popt was
+heavily influenced by the getopt() and getopt_long() functions, but it
+improves on them by allowing more powerful argument expansion. Popt
+can parse arbitrary argv[] style arrays and automatically set
+variables based on command line arguments. Popt allows command line
+arguments to be aliased via configuration files and includes utility
+functions for parsing arbitrary strings into argv[] arrays using
+shell-like rules.
+
+%prep
+%setup -q -n rpm-%{rpm_version}
+%patch -p1
+%{__cp} gendiff gendiff5
+%{__cp} scripts/rpm2cpio scripts/rpm2cpio5
+%{__perl} -pi -e "s|@localedir@|/usr/share/locale|g;" po/Makefile*
+
+%build
+bash ./autogen.sh
+# XXX rpm needs functioning nptl for configure tests
+unset LD_ASSUME_KERNEL || :
+
+%if %{with_python_subpackage}
+WITH_PYTHON="--with-python=%{with_python_version}"
+%else
+WITH_PYTHON="--without-python"
+%endif
+
+%if %{with_perl_subpackage}
+WITH_PERL="--with-perl"
+%else
+WITH_PERL="--without-perl"
+%endif
+bash ./autogen.sh
+%ifos linux
+CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
+./configure --prefix=%{_prefix} --sysconfdir=/etc \
+ --localstatedir=/var --infodir='${prefix}%{__share}/info' \
+ --mandir='${prefix}%{__share}/man' \
+ $WITH_PYTHON $WITH_PERL --enable-posixmutexes --without-javaglue \
+ --localedir=%{_prefix}/share/locale
+%else
+export CPPFLAGS=-I%{_prefix}/include
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} $WITH_PYTHON $WITH_PERL \
+ --without-javaglue
+%endif
+
+make -C zlib || :
+
+make %{?_smp_mflags}
+
+%install
+# XXX rpm needs functioning nptl for configure tests
+unset LD_ASSUME_KERNEL || :
+
+rm -rf $RPM_BUILD_ROOT
+
+%if %{with_perl_subpackage}
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT$installarchlib
+%endif
+
+make DESTDIR="$RPM_BUILD_ROOT" install
+
+%ifos linux
+
+# Save list of packages through cron
+mkdir -p ${RPM_BUILD_ROOT}/etc/cron.daily
+install -m 755 scripts/rpm.daily ${RPM_BUILD_ROOT}/etc/cron.daily/rpm
+
+mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
+install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm
+
+mkdir -p $RPM_BUILD_ROOT/etc/rpm
+
+mkdir -p $RPM_BUILD_ROOT/var/spool/repackage
+mkdir -p $RPM_BUILD_ROOT/var/lib/rpm
+for dbi in \
+ Basenames Conflictname Dirnames Group Installtid Name Packages \
+ Providename Provideversion Requirename Requireversion Triggername \
+ Filemd5s Pubkeys Sha1header Sigmd5 \
+ __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \
+ __db.008 __db.009
+do
+ touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi
+done
+
+%endif
+
+%if %{with_apidocs}
+gzip -9n apidocs/man/man*/* || :
+%endif
+
+# Get rid of unpackaged files
+{ cd $RPM_BUILD_ROOT
+ rm -f .%{_usrlibrpm}/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
+ rm -rf .%{_mandir}/man8/rpmcache.8*
+ rm -rf .%{_mandir}/man8/rpmgraph.8*
+ rm -rf .%{_mandir}/ja/man8/rpmcache.8*
+ rm -rf .%{_mandir}/ja/man8/rpmgraph.8*
+ rm -rf .%{_mandir}/pl/man8/rpmcache.8*
+ rm -rf .%{_mandir}/pl/man8/rpmgraph.8*
+ rm -rf .%{_mandir}/{fr,ko}
+ rm -f .%{_bindir}/rpm{e,i,u}
+%if %{with_python_subpackage}
+ rm -f .%{_libdir}/python%{with_python_version}/site-packages/*.{a,la}
+ rm -f .%{_libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la}
+%endif
+%if %{with_perl_subpackage}
+ find .%{_libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \
+ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+ find .%{_libdir}/perl5 -type d -depth -exec rmdir {} 2>/dev/null ';'
+%endif
+}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%ifos linux
+%pre
+/usr/sbin/groupadd -g 37 rpm > /dev/null 2>&1
+/usr/sbin/useradd -r -d /var/lib/rpm -u 37 -g 37 rpm -s /sbin/nologin > /dev/null 2>&1
+exit 0
+%endif
+
+%post
+%ifos linux
+/sbin/ldconfig
+
+# Establish correct rpmdb ownership.
+/bin/chown rpm:rpm /var/lib/rpm/[A-Z]*
+
+%endif
+exit 0
+
+%ifos linux
+%postun
+/sbin/ldconfig
+if [ $1 = 0 ]; then
+ /usr/sbin/userdel rpm
+ /usr/sbin/groupdel rpm
+fi
+exit 0
+
+%post devel -p /sbin/ldconfig
+%postun devel -p /sbin/ldconfig
+
+%post -n popt5 -p /sbin/ldconfig
+%postun -n popt5 -p /sbin/ldconfig
+%endif
+
+%define rpmattr %attr(0755, rpm, rpm)
+
+%files
+%doc CHANGES GROUPS doc/manual/[a-z]*
+%pubkey wdj/JBJ-GPG-KEY
+%attr(0755, rpm, rpm) /bin/rpm5
+
+%ifos linux
+%config(noreplace,missingok) /etc/cron.daily/rpm
+%config(noreplace,missingok) /etc/logrotate.d/rpm
+%dir /etc/rpm
+#%config(noreplace,missingok) /etc/rpm/macros.*
+%attr(0755, rpm, rpm) %dir /var/lib/rpm
+%attr(0755, rpm, rpm) %dir /var/spool/repackage
+
+%define rpmdbattr %attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace)
+%rpmdbattr /var/lib/rpm/*
+%endif
+
+%rpmattr %{_bindir}/rpm2cpio5
+%rpmattr %{_bindir}/gendiff5
+%rpmattr %{_bindir}/rpmdb5
+#%rpmattr %{_bindir}/rpmdigest5
+#%rpmattr %{_bindir}/rpm[eiu]5
+%rpmattr %{_bindir}/rpmsign5
+%rpmattr %{_bindir}/rpmquery5
+%rpmattr %{_bindir}/rpmverify5
+
+%attr(0755, rpm, rpm) %dir %{_usrlibrpm}
+%rpmattr %{_usrlibrpm}/config.guess
+%rpmattr %{_usrlibrpm}/config.sub
+%attr(0644, rpm, rpm) %{_usrlibrpm}/macros
+%rpmattr %{_usrlibrpm}/mkinstalldirs
+%rpmattr %{_usrlibrpm}/rpm.*
+%rpmattr %{_usrlibrpm}/rpm[deiukqv]
+%rpmattr %{_usrlibrpm}/tgpg
+%attr(0644, rpm, rpm) %{_usrlibrpm}/rpmpopt*
+%attr(0644, rpm, rpm) %{_usrlibrpm}/rpmrc
+
+
+%ifarch i386 i486 i586 i686 athlon pentium3 pentium4
+%attr(-, rpm, rpm) %{_usrlibrpm}/i[3456]86*
+%attr(-, rpm, rpm) %{_usrlibrpm}/athlon*
+%attr(-, rpm, rpm) %{_usrlibrpm}/pentium*
+%endif
+%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
+%attr(-, rpm, rpm) %{_usrlibrpm}/alpha*
+%endif
+%ifarch sparc sparcv8 sparcv9 sparc64
+%attr(-, rpm, rpm) %{_usrlibrpm}/sparc*
+%endif
+%ifarch ia64
+%attr(-, rpm, rpm) %{_usrlibrpm}/ia64*
+%endif
+%ifarch powerpc ppc ppciseries ppcpseries ppcmac ppc64
+%attr(-, rpm, rpm) %{_usrlibrpm}/ppc*
+%endif
+%ifarch s390 s390x
+%attr(-, rpm, rpm) %{_usrlibrpm}/s390*
+%endif
+%ifarch armv3l armv4b armv4l
+%attr(-, rpm, rpm) %{_usrlibrpm}/armv[34][lb]*
+%endif
+%ifarch armv5teb armv5tel
+%attr(-, rpm, rpm) %{_usrlibrpm}/armv[345]*
+%endif
+%ifarch mips mipsel
+%attr(-, rpm, rpm) %{_usrlibrpm}/mips*
+%endif
+%ifarch x86_64
+%attr(-, rpm, rpm) %{_usrlibrpm}/x86_64*
+%endif
+%attr(-, rpm, rpm) %{_usrlibrpm}/noarch*
+
+%rpmattr %{_usrlibrpm}/rpmdb_*
+#%rpmattr %{_usrlibrpm}/rpmfile
+
+%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/rpm.mo
+%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/rpm.mo
+%lang(de) %{__prefix}/*/locale/de/LC_MESSAGES/rpm.mo
+%lang(fi) %{__prefix}/*/locale/fi/LC_MESSAGES/rpm.mo
+%lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/rpm.mo
+%lang(gl) %{__prefix}/*/locale/gl/LC_MESSAGES/rpm.mo
+%lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/rpm.mo
+%lang(ja) %{__prefix}/*/locale/ja/LC_MESSAGES/rpm.mo
+%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/rpm.mo
+%lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/rpm.mo
+%lang(pl) %{__prefix}/*/locale/pl/LC_MESSAGES/rpm.mo
+%lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/rpm.mo
+%lang(pt_BR) %{__prefix}/*/locale/pt_BR/LC_MESSAGES/rpm.mo
+%lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/rpm.mo
+%lang(ru) %{__prefix}/*/locale/ru/LC_MESSAGES/rpm.mo
+%lang(sk) %{__prefix}/*/locale/sk/LC_MESSAGES/rpm.mo
+%lang(sl) %{__prefix}/*/locale/sl/LC_MESSAGES/rpm.mo
+%lang(sr) %{__prefix}/*/locale/sr/LC_MESSAGES/rpm.mo
+%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/rpm.mo
+%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/rpm.mo
+%lang(uk) %{__prefix}/*/locale/uk/LC_MESSAGES/rpm.mo
+
+%{_mandir}/man8/rpm.8*
+%{_mandir}/man8/rpm2cpio.8*
+%lang(ja) %{_mandir}/ja/man8/rpm.8*
+%lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
+#%lang(ko) %{_mandir}/ko/man8/rpm.8*
+#%lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
+%lang(pl) %{_mandir}/pl/man8/rpm.8*
+%lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
+%lang(ru) %{_mandir}/ru/man8/rpm.8*
+%lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
+%lang(sk) %{_mandir}/sk/man8/rpm.8*
+
+%files libs
+%{_libdir}/librpm5-4.4.so
+%{_libdir}/librpmdb5-4.4.so
+%{_libdir}/librpmio5-4.4.so
+%{_libdir}/librpmbuild5-4.4.so
+
+%files build
+%dir %{__prefix}/src/rpm
+%dir %{__prefix}/src/rpm/BUILD
+%dir %{__prefix}/src/rpm/SPECS
+%dir %{__prefix}/src/rpm/SOURCES
+%dir %{__prefix}/src/rpm/SRPMS
+%dir %{__prefix}/src/rpm/RPMS
+%{__prefix}/src/rpm/RPMS/*
+%rpmattr %{_bindir}/rpmbuild5
+%rpmattr %{_usrlibrpm}/brp-*
+%rpmattr %{_usrlibrpm}/check-files
+%rpmattr %{_usrlibrpm}/config.site
+%rpmattr %{_usrlibrpm}/cross-build
+%rpmattr %{_usrlibrpm}/debugedit
+%rpmattr %{_usrlibrpm}/find-debuginfo.sh
+%rpmattr %{_usrlibrpm}/find-lang.sh
+%rpmattr %{_usrlibrpm}/find-prov.pl
+%rpmattr %{_usrlibrpm}/find-provides
+%rpmattr %{_usrlibrpm}/find-provides.perl
+%rpmattr %{_usrlibrpm}/find-req.pl
+%rpmattr %{_usrlibrpm}/find-requires
+%rpmattr %{_usrlibrpm}/find-requires.perl
+%rpmattr %{_usrlibrpm}/getpo.sh
+%rpmattr %{_usrlibrpm}/http.req
+%rpmattr %{_usrlibrpm}/javadeps.sh
+%rpmattr %{_usrlibrpm}/magic
+%rpmattr %{_usrlibrpm}/magic.mgc
+%rpmattr %{_usrlibrpm}/magic.mime
+%rpmattr %{_usrlibrpm}/magic.mime.mgc
+
+%rpmattr %{_usrlibrpm}/executabledeps.sh
+%rpmattr %{_usrlibrpm}/libtooldeps.sh
+%rpmattr %{_usrlibrpm}/perldeps.pl
+%rpmattr %{_usrlibrpm}/perl.prov
+%rpmattr %{_usrlibrpm}/perl.req
+%rpmattr %{_usrlibrpm}/php.prov
+%rpmattr %{_usrlibrpm}/php.req
+%rpmattr %{_usrlibrpm}/pkgconfigdeps.sh
+%rpmattr %{_usrlibrpm}/pythondeps.sh
+%rpmattr %{_usrlibrpm}/rpmdeps
+
+%rpmattr %{_usrlibrpm}/rpm[bt]
+%rpmattr %{_usrlibrpm}/symclash.*
+%rpmattr %{_usrlibrpm}/u_pkg.sh
+%rpmattr %{_usrlibrpm}/vpkg-provides.sh
+%rpmattr %{_usrlibrpm}/vpkg-provides2.sh
+
+%{_mandir}/man1/gendiff.1*
+%{_mandir}/man8/rpmbuild.8*
+%{_mandir}/man8/rpmdeps.8*
+#%lang(ja) %{_mandir}/ja/man1/gendiff.1*
+%lang(ja) %{_mandir}/ja/man8/rpmbuild.8*
+#%lang(ja) %{_mandir}/ja/man8/rpmdeps.8*
+#%lang(ko) %{_mandir}/ko/man1/gendiff.1*
+#%lang(ko) %{_mandir}/ko/man8/rpmbuild.8*
+#%lang(ko) %{_mandir}/ko/man8/rpmdeps.8*
+%lang(pl) %{_mandir}/pl/man1/gendiff.1*
+%lang(pl) %{_mandir}/pl/man8/rpmbuild.8*
+%lang(pl) %{_mandir}/pl/man8/rpmdeps.8*
+#%lang(ru) %{_mandir}/ru/man1/gendiff.1*
+#%lang(ru) %{_mandir}/ru/man8/rpmbuild.8*
+#%lang(ru) %{_mandir}/ru/man8/rpmdeps.8*
+#%lang(sk) %{_mandir}/sk/man1/gendiff.1*
+#%lang(sk) %{_mandir}/sk/man8/rpmbuild.8*
+#%lang(sk) %{_mandir}/sk/man8/rpmdeps.8*
+
+%if %{with_python_subpackage}
+%files python
+%{_libdir}/python%{with_python_version}/site-packages/rpm
+%endif
+
+%if %{with_perl_subpackage}
+%files perl
+%{_libdir}/perl5/site_perl/*/*/auto/RPM
+%{_libdir}/perl5/site_perl/*/*/RPM.*
+%{_mandir}/man3/RPM.*
+%endif
+
+%files devel
+%if %{with_apidocs}
+%doc apidocs
+%endif
+%{_includedir}/rpm
+%{_libdir}/librpm5.a
+%{_libdir}/librpm5.la
+%{_libdir}/librpm5.so
+%{_libdir}/librpmdb5.a
+%{_libdir}/librpmdb5.la
+%{_libdir}/librpmdb5.so
+%{_libdir}/librpmio5.a
+%{_libdir}/librpmio5.la
+%{_libdir}/librpmio5.so
+%{_libdir}/librpmbuild5.a
+%{_libdir}/librpmbuild5.la
+%{_libdir}/librpmbuild5.so
+
+%files -n popt5
+%{_libdir}/libpopt5.so.*
+%{_mandir}/man3/popt.3*
+%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/popt.mo
+%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/popt.mo
+%lang(de) %{__prefix}/*/locale/de/LC_MESSAGES/popt.mo
+%lang(es) %{__prefix}/*/locale/es/LC_MESSAGES/popt.mo
+%lang(eu_ES) %{__prefix}/*/locale/eu_ES/LC_MESSAGES/popt.mo
+%lang(fi) %{__prefix}/*/locale/fi/LC_MESSAGES/popt.mo
+%lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/popt.mo
+%lang(gl) %{__prefix}/*/locale/gl/LC_MESSAGES/popt.mo
+%lang(hu) %{__prefix}/*/locale/hu/LC_MESSAGES/popt.mo
+%lang(id) %{__prefix}/*/locale/id/LC_MESSAGES/popt.mo
+%lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/popt.mo
+%lang(it) %{__prefix}/*/locale/it/LC_MESSAGES/popt.mo
+%lang(ja) %{__prefix}/*/locale/ja/LC_MESSAGES/popt.mo
+%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/popt.mo
+%lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/popt.mo
+%lang(pl) %{__prefix}/*/locale/pl/LC_MESSAGES/popt.mo
+%lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/popt.mo
+%lang(pt_BR) %{__prefix}/*/locale/pt_BR/LC_MESSAGES/popt.mo
+%lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/popt.mo
+%lang(ru) %{__prefix}/*/locale/ru/LC_MESSAGES/popt.mo
+%lang(sk) %{__prefix}/*/locale/sk/LC_MESSAGES/popt.mo
+%lang(sl) %{__prefix}/*/locale/sl/LC_MESSAGES/popt.mo
+%lang(sr) %{__prefix}/*/locale/sr/LC_MESSAGES/popt.mo
+%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/popt.mo
+%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/popt.mo
+%lang(uk) %{__prefix}/*/locale/uk/LC_MESSAGES/popt.mo
+%lang(wa) %{__prefix}/*/locale/wa/LC_MESSAGES/popt.mo
+%lang(zh) %{__prefix}/*/locale/zh/LC_MESSAGES/popt.mo
+%lang(zh_CN) %{__prefix}/*/locale/zh_CN/LC_MESSAGES/popt.mo
+%lang(zh_TW) %{__prefix}/*/locale/zh_TW/LC_MESSAGES/popt.mo
+
+## XXX These may end up in popt-devel but it hardly seems worth the effort.
+%{_libdir}/libpopt5.a
+%{_libdir}/libpopt5.la
+%{_libdir}/libpopt5.so
+%{_includedir}/popt.h
+
+%changelog
+* Thu May 31 2007 Dries Verachtert <dries at ulyssis.org> - 4.5-0.3.1
+- Requires python 2.4 instead of 2.5 so it compiles on fc6: TODO problem?
+- Renamed to rpm5
+- Added a patch so quite a lot of files are built and installed with suffix '5'
+- todo: gettext-devel, aclocal, autoconf, automake
+- todo: touch compile
+- todo in prep: gendiff -> gendiff5 moven
+- USRLIBRPM set to /usr/lib/rpm5
+
+* Fri May 25 2007 Jeff Johnson <jbj at jbj.org> 4.5-0.3
+- solaris: add clearenv stub.
+- keys: add Getpass stub vector.
+- fix: swap PART_INSTALL and PART_CLEAN automagic cleanup.
+- build against rpm5.org cvs,
+
+* Tue May 22 2007 Jeff Johnson <jbj at jbj.org> 4.5-0.2
+- fix: avoid accessing freed memory.
+
+* Mon May 21 2007 Jeff Johnson <jbj at jbj.org> 4.5-0.1
+- start rpm-4.5 development.
More information about the svn-commits
mailing list