openpkg-packages/openpkg/rpm.patch.feature

##
##  rpm.patch.feature -- Annotated patch file
##  Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
##  Copyright (c) 2000-2003 Ralf S. Engelschall <rse@engelschall.com>
##  Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
##
##  This file assembles changes to existing RPM source files between
##  the original RedHat RPM and the OpenPKG RPM variant. It can be
##  automatically applied to a vanilla RedHat RPM source tree with the
##  'patch' tool to upgrade those files. Each patch snippet is annotated
##  with a short description.
##
##  Created on: 28-Aug-2003
##
##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
##

+---------------------------------------------------------------------------
| Remove "tools" directory from sub-directory list because it contains
| things we are not interested in and which cause some build trouble
| anyway.
| Use a plain "rpmpopt" file without any trailing version.
| Adjust paths to conform to OpenPKG filesystem layout.
+---------------------------------------------------------------------------
Index: Makefile.am
--- Makefile.am	29 May 2003 18:20:28 -0000	1.1.1.17
+++ Makefile.am	26 Aug 2003 08:14:57 -0000
@@ -12,9 +12,9 @@
 	xmlspec/examples/*.sh xmlspec/examples/*.lst \
 	xmlspec/examples/*.xmlspec \
 	po/*.in po/*.po po/rpm.pot \
-	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
+	rpm.magic rpmpopt rpmqv.c rpm.c
 
-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+SUBDIRS = intl @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ scripts tests doc .
 
 INCLUDES = \
 	-I$(top_srcdir)/build \
@@ -47,13 +47,10 @@
 
 pkglibdir =		@RPMCONFIGDIR@
 pkglib_PROGRAMS =	rpmb rpmd rpmi rpmk rpmq
-pkglib_DATA =		rpmrc rpmpopt-$(VERSION) macros
+pkglib_DATA =		rpmrc rpmpopt macros
 pkglib_SCRIPTS =	find-provides find-requires mkinstalldirs \
 			config.guess config.sub config.site
 
-rpmpopt-$(VERSION): rpmpopt
-	cp rpmpopt $@
-
 noinst_HEADERS = build.h debug.h system.h
 
 rpm_SOURCES =
@@ -124,32 +121,32 @@
 pkgsrcdir = $(prefix)/src/$(RPMCANONVENDOR)
 
 install-data-local:
-	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
+	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/openpkg
 	@rm -f $(DESTDIR)$(libdir)/rpmrc
 	@@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc
 	@rm -f $(DESTDIR)$(libdir)/rpmpopt
 	@@LN_S@ rpm/rpmpopt $(DESTDIR)$(libdir)/rpmpopt
 	@rm -f $(DESTDIR)$(libdir)/rpm/rpmt
-	@@LN_S@ rpmb $(DESTDIR)$(libdir)/rpm/rpmt
-	@rm -f $(DESTDIR)$(libdir)/rpm/rpme
-	@@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpme
-	@rm -f $(DESTDIR)$(libdir)/rpm/rpmu
-	@@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpmu
-	@rm -f $(DESTDIR)$(libdir)/rpm/rpmv
-	@@LN_S@ rpmq $(DESTDIR)$(libdir)/rpm/rpmv
+	@@LN_S@ rpmb $(DESTDIR)$(libdir)/openpkg/rpmt
+	@rm -f $(DESTDIR)$(libdir)/openpkg/rpme
+	@@LN_S@ rpmi $(DESTDIR)$(libdir)/openpkg/rpme
+	@rm -f $(DESTDIR)$(libdir)/openpkg/rpmu
+	@@LN_S@ rpmi $(DESTDIR)$(libdir)/openpkg/rpmu
+	@rm -f $(DESTDIR)$(libdir)/openpkg/rpmv
+	@@LN_S@ rpmq $(DESTDIR)$(libdir)/openpkg/rpmv
 	rm -f $(DESTDIR)$(bindir)/rpmbuild
-	@LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild
+	@LN_S@ ../lib/openpkg/rpmb $(DESTDIR)$(bindir)/rpmbuild
 	rm -f $(DESTDIR)$(bindir)/rpmquery
-	@LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery
+	@LN_S@ ../lib/openpkg/rpmq $(DESTDIR)$(bindir)/rpmquery
 	rm -f $(DESTDIR)$(bindir)/rpmverify
-	@LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify
+	@LN_S@ ../lib/openpkg/rpmv $(DESTDIR)$(bindir)/rpmverify
 	rm -f $(DESTDIR)$(bindir)/rpmsign
-	@LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign
+	@LN_S@ ../lib/openpkg/rpmk $(DESTDIR)$(bindir)/rpmsign
 	rm -f $(DESTDIR)$(bindir)/rpmdb ; \
-	@LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
+	@LN_S@ ../lib/openpkg/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
 	for bf in e i u ; do \
 	    rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
-	    @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
+	    @LN_S@ ../lib/openpkg/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
 	done
 	@for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
 	    $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
@@ -198,10 +195,10 @@
 	    $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)/$$f ;\
 	done
 	@$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
-	@$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/rpm
-	-@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/[A-Z]*
-	-@$(__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/rpm
-	-@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/__db.*
+	@$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/openpkg
+	-@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/openpkg/[A-Z]*
+	-@$(__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/openpkg
+	-@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/openpkg/__db.*
 
 .PHONY:	unsetgid
 unsetgid:
@@ -244,7 +241,7 @@
 	@sudo ./rpm -ta rpm-$(VERSION).tar.gz
 
 .PHONY:	doxygen
-doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt-@VERSION@
+doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt
 	rm -rf $@
 	mkdir -p $@
 	- [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@

+---------------------------------------------------------------------------
| Remove "tools" directory from sub-directory list because it contains
| things we are not interested in and which cause some build trouble
| anyway.
| Use a plain "rpmpopt" file without any trailing version.
| Adjust paths to conform to OpenPKG filesystem layout.
+---------------------------------------------------------------------------
Index: Makefile.in
--- Makefile.in	16 Jul 2003 17:05:42 -0000	1.1.1.23
+++ Makefile.in	26 Aug 2003 08:15:04 -0000
@@ -265,10 +265,10 @@
 	xmlspec/examples/*.sh xmlspec/examples/*.lst \
 	xmlspec/examples/*.xmlspec \
 	po/*.in po/*.po po/rpm.pot \
-	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
+	rpm.magic rpmpopt rpmqv.c rpm.c
 
 
-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+SUBDIRS = intl @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ scripts tests doc .
 
 INCLUDES = \
 	-I$(top_srcdir)/build \
@@ -301,7 +301,7 @@
 bin_PROGRAMS = rpm2cpio
 bin_SCRIPTS = gendiff
 pkglib_PROGRAMS = rpmb rpmd rpmi rpmk rpmq
-pkglib_DATA = rpmrc rpmpopt-$(VERSION) macros
+pkglib_DATA = rpmrc rpmpopt macros
 pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \
 			config.guess config.sub config.site
 
@@ -1058,8 +1058,6 @@
 	uninstall-rpmbinPROGRAMS
 
 
-rpmpopt-$(VERSION): rpmpopt
-	cp rpmpopt $@
 rpm.o:	rpmqv.c
 	$(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c
 rpmb.o:	rpmqv.c
@@ -1097,32 +1095,32 @@
 		`make -s sources -C popt`
 
 install-data-local:
-	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
+	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/openpkg
 	@rm -f $(DESTDIR)$(libdir)/rpmrc
 	@@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc
 	@rm -f $(DESTDIR)$(libdir)/rpmpopt
 	@@LN_S@ rpm/rpmpopt $(DESTDIR)$(libdir)/rpmpopt
-	@rm -f $(DESTDIR)$(libdir)/rpm/rpmt
-	@@LN_S@ rpmb $(DESTDIR)$(libdir)/rpm/rpmt
-	@rm -f $(DESTDIR)$(libdir)/rpm/rpme
-	@@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpme
-	@rm -f $(DESTDIR)$(libdir)/rpm/rpmu
-	@@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpmu
-	@rm -f $(DESTDIR)$(libdir)/rpm/rpmv
-	@@LN_S@ rpmq $(DESTDIR)$(libdir)/rpm/rpmv
+	@rm -f $(DESTDIR)$(libdir)/openpkg/rpmt
+	@@LN_S@ rpmb $(DESTDIR)$(libdir)/openpkg/rpmt
+	@rm -f $(DESTDIR)$(libdir)/openpkg/rpme
+	@@LN_S@ rpmi $(DESTDIR)$(libdir)/openpkg/rpme
+	@rm -f $(DESTDIR)$(libdir)/openpkg/rpmu
+	@@LN_S@ rpmi $(DESTDIR)$(libdir)/openpkg/rpmu
+	@rm -f $(DESTDIR)$(libdir)/openpkg/rpmv
+	@@LN_S@ rpmq $(DESTDIR)$(libdir)/openpkg/rpmv
 	rm -f $(DESTDIR)$(bindir)/rpmbuild
-	@LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild
+	@LN_S@ ../lib/openpkg/rpmb $(DESTDIR)$(bindir)/rpmbuild
 	rm -f $(DESTDIR)$(bindir)/rpmquery
-	@LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery
+	@LN_S@ ../lib/openpkg/rpmq $(DESTDIR)$(bindir)/rpmquery
 	rm -f $(DESTDIR)$(bindir)/rpmverify
-	@LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify
+	@LN_S@ ../lib/openpkg/rpmv $(DESTDIR)$(bindir)/rpmverify
 	rm -f $(DESTDIR)$(bindir)/rpmsign
-	@LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign
+	@LN_S@ ../lib/openpkg/rpmk $(DESTDIR)$(bindir)/rpmsign
 	rm -f $(DESTDIR)$(bindir)/rpmdb ; \
-	@LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
+	@LN_S@ ../lib/openpkg/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
 	for bf in e i u ; do \
 	    rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
-	    @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
+	    @LN_S@ ../lib/openpkg/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
 	done
 	@for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
 	    $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
@@ -1171,10 +1169,10 @@
 	    $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)/$$f ;\
 	done
 	@$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
-	@$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/rpm
-	-@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/[A-Z]*
-	-@$(__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/rpm
-	-@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/__db.*
+	@$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/openpkg
+	-@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/openpkg/[A-Z]*
+	-@$(__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/openpkg
+	-@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/openpkg/__db.*
 
 .PHONY:	unsetgid
 unsetgid:
@@ -1217,7 +1215,7 @@
 	@sudo ./rpm -ta rpm-$(VERSION).tar.gz
 
 .PHONY:	doxygen
-doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt-@VERSION@
+doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt
 	rm -rf $@
 	mkdir -p $@
 	- [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@

+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
| alternatively can be placed into the .spec directory and are picked
| up there, too.
+---------------------------------------------------------------------------
Index: build/build.c
--- build/build.c	4 Mar 2003 15:27:33 -0000	1.1.1.20
+++ build/build.c	24 Aug 2003 13:10:15 -0000
@@ -33,7 +33,15 @@
 
     for (p = spec->sources; p != NULL; p = p->next) {
 	if (! (p->flags & RPMBUILD_ISNO)) {
+#ifndef OPENPKG
 	    const char *fn = rpmGetPath("%{_sourcedir}/", p->source, NULL);
+#else
+	    const char *fn = rpmGetPath("%{_specdir}/", p->source, NULL);
+        if (access(fn, F_OK) == -1) {
+            fn = _free(fn);
+	        fn = rpmGetPath("%{_sourcedir}/", p->source, NULL);
+        }
+#endif
 	    rc = Unlink(fn);
 	    fn = _free(fn);
 	}
@@ -42,7 +50,15 @@
     for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
 	for (p = pkg->icon; p != NULL; p = p->next) {
 	    if (! (p->flags & RPMBUILD_ISNO)) {
+#ifndef OPENPKG
 		const char *fn = rpmGetPath("%{_sourcedir}/", p->source, NULL);
+#else
+		const char *fn = rpmGetPath("%{_specdir}/", p->source, NULL);
+        if (access(fn, F_OK) == -1) {
+            fn = _free(fn);
+		    fn = rpmGetPath("%{_sourcedir}/", p->source, NULL);
+        }
+#endif
 		rc = Unlink(fn);
 		fn = _free(fn);
 	    }

+---------------------------------------------------------------------------
| Make sure the "Provides" headers are available for querying from the
| .src.rpm files.
+---------------------------------------------------------------------------
Index: build/files.c
--- build/files.c	4 Mar 2003 17:04:13 -0000	1.1.1.20
+++ build/files.c	25 Aug 2003 09:42:08 -0000
@@ -2183,6 +2183,11 @@
 	case RPMTAG_CHANGELOGTEXT:
 	case RPMTAG_URL:
 	case HEADER_I18NTABLE:
+#ifdef OPENPKG
+	case RPMTAG_PROVIDENAME:
+	case RPMTAG_PROVIDEVERSION:
+	case RPMTAG_PROVIDEFLAGS:
+#endif
 	    if (ptr)
 		(void)headerAddEntry(spec->sourceHeader, tag, type, ptr, count);
 	    /*@switchbreak@*/ break;

+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
| alternatively can be placed into the .spec directory and are picked
| up there, too.
+---------------------------------------------------------------------------
Index: build/files.c
--- build/files.c	4 Mar 2003 17:04:13 -0000	1.1.1.20
+++ build/files.c	25 Aug 2003 09:42:08 -0000
@@ -2253,8 +2258,20 @@
 	}
 
       {	const char * sfn;
+#ifndef OPENPKG
 	sfn = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
 		"%{_sourcedir}/", srcPtr->source, NULL);
+#else
+        const char *sfn2;
+	sfn2 = rpmGetPath("%{_specdir}/", srcPtr->source, NULL);
+        if (access(sfn2, F_OK) == 0)
+	    sfn = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
+                "%{_specdir}/", srcPtr->source, NULL);
+        else
+	    sfn = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
+                "%{_sourcedir}/", srcPtr->source, NULL);
+        sfn2 = _free(sfn2);
+#endif
 	appendLineStringBuf(sourceFiles, sfn);
 	sfn = _free(sfn);
       }
@@ -2263,8 +2280,20 @@
     for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
 	for (srcPtr = pkg->icon; srcPtr != NULL; srcPtr = srcPtr->next) {
 	    const char * sfn;
+#ifndef OPENPKG
 	    sfn = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
 		"%{_sourcedir}/", srcPtr->source, NULL);
+#else
+            const char *sfn2;
+	    sfn2 = rpmGetPath("%{_specdir}/", srcPtr->source, NULL);
+        if (access(sfn2, F_OK) == 0)
+	    sfn = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
+                "%{_specdir}/", srcPtr->source, NULL);
+        else
+	    sfn = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
+                "%{_sourcedir}/", srcPtr->source, NULL);
+        sfn2 = _free(sfn2);
+#endif
 	    appendLineStringBuf(sourceFiles, sfn);
 	    sfn = _free(sfn);
 	}

+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
| alternatively can be placed into the .spec directory and are picked
| up there, too.
+---------------------------------------------------------------------------
Index: build/parsePreamble.c
--- build/parsePreamble.c	3 Mar 2003 20:46:34 -0000	1.1.1.13
+++ build/parsePreamble.c	24 Aug 2003 13:10:15 -0000
@@ -366,7 +366,15 @@
     size_t nb, iconsize;
 
     /* XXX use rpmGenPath(rootdir, "%{_sourcedir}/", file) for icon path. */
+#ifndef OPENPKG
     fn = rpmGetPath("%{_sourcedir}/", file, NULL);
+#else
+    fn = rpmGetPath("%{_specdir}/", file, NULL);
+    if (access(fn, F_OK) == -1) {
+        fn = _free(fn);
+        fn = rpmGetPath("%{_sourcedir}/", file, NULL);
+    }
+#endif
 
     fd = Fopen(fn, "r.ufdio");
     if (fd == NULL || Ferror(fd)) {

+---------------------------------------------------------------------------
| In OpenPKG, the RPM package contains own local versions of the
| "patch" and "tar" tools, so we cannot accept hard-coded names here.
| Instead we expand a variable to allow us to direct RPM to our tools.
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c	7 Aug 2002 14:20:45 -0000	1.1.1.10
+++ build/parsePrep.c	28 Aug 2003 08:13:15 -0000
@@ -76,6 +76,7 @@
     struct Source *sp;
     rpmCompressedMagic compressed = COMPRESSED_NOT;
     int urltype;
+    const char *patcher;
 
     for (sp = spec->sources; sp != NULL; sp = sp->next) {
 	if ((sp->flags & RPMBUILD_ISPATCH) && (sp->num == c)) {
@@ -124,6 +133,10 @@
 	/*@notreached@*/ break;
     }
 
+    patcher = rpmGetPath("%{_patchbin}", NULL);
+    if (strcmp(patcher, "%{_patchbin}") == 0)
+        patcher = "patch";
+
     if (compressed) {
 	const char *zipper = rpmGetPath(
 	    (compressed == COMPRESSED_BZIP2 ? "%{_bzip2bin}" : "%{_gzipbin}"),
@@ -131,22 +144,23 @@
 
 	sprintf(buf,
 		"echo \"Patch #%d (%s):\"\n"
-		"%s -d < %s | patch -p%d %s -s\n"
+		"%s -d < %s | %s -p%d %s -s\n"
 		"STATUS=$?\n"
 		"if [ $STATUS -ne 0 ]; then\n"
 		"  exit $STATUS\n"
 		"fi",
 		c, /*@-unrecog@*/ (const char *) basename(fn), /*@=unrecog@*/
 		zipper,
-		fn, strip, args);
+		fn, patcher, strip, args);
 	zipper = _free(zipper);
     } else {
 	sprintf(buf,
 		"echo \"Patch #%d (%s):\"\n"
-		"patch -p%d %s -s < %s", c, (const char *) basename(fn),
-		strip, args, fn);
+		"%s -p%d %s -s < %s", c, (const char *) basename(fn),
+		patcher, strip, args, fn);
     }
 
+    patcher = _free(patcher);
     urlfn = _free(urlfn);
     return buf;
 }
@@ -171,6 +185,7 @@
     struct Source *sp;
     rpmCompressedMagic compressed = COMPRESSED_NOT;
     int urltype;
+    const char *tar;
 
     for (sp = spec->sources; sp != NULL; sp = sp->next) {
 	if ((sp->flags & RPMBUILD_ISSOURCE) && (sp->num == c)) {
@@ -228,6 +251,10 @@
 	/*@notreached@*/ break;
     }
 
+    tar = rpmGetPath("%{_tarbin}", NULL);
+    if (strcmp(tar, "%{_tarbin}") == 0)
+        tar = "tar";
+
     if (compressed != COMPRESSED_NOT) {
 	const char *zipper;
 	int needtar = 1;
@@ -254,8 +281,13 @@
 	zipper = _free(zipper);
 	*t++ = ' ';
 	t = stpcpy(t, fn);
-	if (needtar)
-	    t = stpcpy( stpcpy( stpcpy(t, " | tar "), taropts), " -");
+	if (needtar) {
+	    t = stpcpy(t, " | ");
+            t = stpcpy(t, tar);
+            t = stpcpy(t, " ");
+            t = stpcpy(t, taropts);
+            t = stpcpy(t, " -");
+        }
 	t = stpcpy(t,
 		"\n"
 		"STATUS=$?\n"
@@ -264,11 +296,14 @@
 		"fi");
     } else {
 	buf[0] = '\0';
-	t = stpcpy( stpcpy(buf, "tar "), taropts);
-	*t++ = ' ';
+	t = stpcpy(buf, tar);
+	t = stpcpy(t, " ");
+	t = stpcpy(t, taropts);
+	t = stpcpy(t, " ");
 	t = stpcpy(t, fn);
     }
 
+    tar = _free(tar);
     urlfn = _free(urlfn);
     return buf;
 }

+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
| alternatively can be placed into the .spec directory and are picked
| up there, too.
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c	7 Aug 2002 14:20:45 -0000	1.1.1.10
+++ build/parsePrep.c	28 Aug 2003 08:13:15 -0000
@@ -87,7 +88,15 @@
 	return NULL;
     }
 
+#ifndef OPENPKG
     urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
+#else
+    urlfn = rpmGetPath("%{_specdir}/", sp->source, NULL);
+    if (access(urlfn, F_OK) == -1) {
+        urlfn = _free(urlfn);
+        urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
+    }
+#endif
 
     args[0] = '\0';
     if (db) {
@@ -182,7 +197,15 @@
 	return NULL;
     }
 
+#ifndef OPENPKG
     urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
+#else
+    urlfn = rpmGetPath("%{_specdir}/", sp->source, NULL);
+    if (access(urlfn, F_OK) == -1) {
+        urlfn = _free(urlfn);
+        urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
+    }
+#endif
 
     /*@-internalglobs@*/ /* FIX: shrug */
     taropts = ((rpmIsVerbose() && !quietly) ? "-xvvf" : "-xf");

+---------------------------------------------------------------------------
| Not everything on a system is RPM based (for instance OpenPKG is
| just an add-on to the system), so do not assume we can just require
| a package to provide "/bin/sh".
+---------------------------------------------------------------------------
Index: build/parseScript.c
--- build/parseScript.c	23 Jun 2002 19:47:12 -0000	1.1.1.12
+++ build/parseScript.c	24 Aug 2003 13:10:15 -0000
@@ -261,6 +261,7 @@
     stripTrailingBlanksStringBuf(sb);
     p = getStringBuf(sb);
 
+    if (progArgv[0] != NULL && strcmp(progArgv[0], "/bin/sh") != 0)
     (void) addReqProv(spec, pkg->header, (tagflags | RPMSENSE_INTERP), progArgv[0], NULL, 0);
 
     /* Trigger script insertion is always delayed in order to */

+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
| alternatively can be placed into the spec directory and are picked
| up there, too.
+---------------------------------------------------------------------------
Index: build/spec.c
--- build/spec.c	4 Mar 2003 15:25:51 -0000	1.1.1.21
+++ build/spec.c	24 Aug 2003 13:10:15 -0000
@@ -334,7 +334,15 @@
 
     if (tag != RPMTAG_ICON) {
 	/*@-nullpass@*/		/* LCL: varargs needs null annotate. */
+#ifndef OPENPKG
 	const char *body = rpmGetPath("%{_sourcedir}/", p->source, NULL);
+#else
+	const char *body = rpmGetPath("%{_specdir}/", p->source, NULL);
+    if (access(body, F_OK) == -1) {
+        body = _free(body);
+	    body = rpmGetPath("%{_sourcedir}/", p->source, NULL);
+    }
+#endif
 	/*@=nullpass@*/
 
 	sprintf(buf, "%s%d",

+---------------------------------------------------------------------------
| Do not build with warnings on, because we do no RPM development
| (so warnings are useless here), they cause some confusion inside
| Berkeley-DB and also slow down building. Instead, increase the
| optimization level. Additionally, disable static linking of RPM
| tools. Finally, use "shtool mkdir" as the "mkdir -p" fallback.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac	2 Jul 2003 19:20:52 -0000	1.1.1.4
+++ configure.ac	26 Aug 2003 08:06:43 -0000
@@ -53,7 +53,7 @@
 AS=${AS-as}
 AC_SUBST(AS)
 if test "$ac_cv_prog_gcc" = yes; then
-    CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
+    CFLAGS="$CFLAGS -pipe -O2 -D_GNU_SOURCE -D_REENTRANT"
 fi
 export CFLAGS
 
@@ -142,6 +142,7 @@
 	# just link it dynamically
 	LDFLAGS_STATIC=""
 fi
+LDFLAGS_STATIC="" # OpenPKG wants dynamically linked RPM tools
 LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}"	# libtool format
 AC_MSG_RESULT($LDFLAGS_STATIC)
 AC_SUBST(LDFLAGS_STATIC)
@@ -201,7 +202,7 @@
 
 if test X"$MKDIR_P" = X0 ; then
 	AC_MSG_RESULT(no)
-	MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`"
+	MKDIR_P="@l_prefix@/lib/openpkg/shtool mkdir -f -p -m 755"
 else
 	AC_MSG_RESULT(yes)
 fi

+---------------------------------------------------------------------------
| Adjust paths for OpenPKG filesystem layout.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac	2 Jul 2003 19:20:52 -0000	1.1.1.4
+++ configure.ac	26 Aug 2003 08:06:43 -0000
@@ -1200,12 +1202,12 @@
 AC_SUBST(LOCALEDIR)
 LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
 AC_SUBST(LIBDIR)
-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
+RPMCONFIGDIR="@l_prefix@/lib/openpkg"
 AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR",
 	[Full path to rpm global configuration directory (usually /usr/lib/rpm)])
 AC_SUBST(RPMCONFIGDIR)
 
-SYSCONFIGDIR="`echo /etc/rpm`"
+SYSCONFIGDIR="@l_prefix@/etc/openpkg"
 AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR",
 	[Full path to rpm system configuration directory (usually /etc/rpm)])
 AC_SUBST(SYSCONFIGDIR)
@@ -1215,17 +1217,17 @@
 	[Colon separated paths of macro files to read.])
 AC_SUBST(MACROFILES)
 
-LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
+LIBRPMRC_FILENAME="${SYSCONFIGDIR}/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="${RPMCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
+VENDORRPMRC_FILENAME="${SYSCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
 AC_DEFINE_UNQUOTED(VENDORRPMRC_FILENAME, "$VENDORRPMRC_FILENAME",
        [Full path to vendor rpmrc configuration file (usually /usr/lib/rpm/vendor/rpmrc)])
 AC_SUBST(VENDORRPMRC_FILENAME)
 
-LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}"
+LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt"
 AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME",
 	[Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt)])
 AC_SUBST(LIBRPMALIAS_FILENAME)

+---------------------------------------------------------------------------
| RPM has two platform id canonicalizations: hard-coded ones in
| the "rpm" program and defined ones in the rpmrc files. The
| hard-coded ones make the defined ones inconsistent. Additionally,
| in OpenPKG we know exactly what we do. So, disable the hard-coded
| canonicalizations and use only the defined ones. The only thing we
| do inside RPM is to reduce the platform version to major and minor
| version numbers in order to simplify the "rpmrc" files. Then, RPM
| allows to read the platform from an external program. Adjust the
| hard-coded path to this program and allow it to be overridden with
| the macro %{__platform}. Finally, change the default definition of
| %{_host} to not contain the vendor stuff to more conform to what
| %{_target} usually is defined to and what we are using throughout
| OpenPKG, too.
+---------------------------------------------------------------------------
Index: lib/rpmrc.c
--- lib/rpmrc.c	4 Jun 2003 18:18:45 -0000	1.1.1.25
+++ lib/rpmrc.c	26 Aug 2003 07:25:49 -0000
@@ -27,7 +27,7 @@
 const char * macrofiles = MACROFILES;
 
 /*@observer@*/ /*@unchecked@*/
-static const char * platform = "/etc/rpm/platform";
+static const char * platform = "@l_prefix@/etc/openpkg/platform";
 /*@only@*/ /*@relnull@*/ /*@unchecked@*/
 static const char ** platpat = NULL;
 /*@unchecked@*/
@@ -861,7 +861,11 @@
 
 	platpat = xrealloc(platpat, (nplatpat + 2) * sizeof(*platpat));
 /*@-onlyunqglobaltrans@*/
+#ifdef OPENPKG
+	platpat[nplatpat] = rpmExpand("%{_host_cpu}-%{_host_os}", NULL);
+#else
 	platpat[nplatpat] = rpmExpand("%{_host_cpu}-%{_host_vendor}-%{_host_os}", (gnu && *gnu ? "-" : NULL), gnu, NULL);
+#endif
 	nplatpat++;
 	platpat[nplatpat] = NULL;
 /*@=onlyunqglobaltrans@*/
@@ -1062,7 +1066,15 @@
     int rc;
 
     while (!gotDefaults) {
+#ifdef OPENPKG
+	const char *cp;
+	cp = rpmExpand("%{?__platform}", NULL);
+    if (cp == NULL || cp[0] == '\0')
+	    cp = platform;
+	if (!rpmPlatform(cp)) {
+#else
 	if (!rpmPlatform(platform)) {
+#endif
 	    const char * s;
 	    s = rpmExpand("%{_host_cpu}", NULL);
 	    if (s) {
@@ -1082,6 +1094,32 @@
 	rc = uname(&un);
 	if (rc < 0) return;
 
+#ifdef OPENPKG
+    {
+        char *cp;
+        char *cpR;
+        int n;
+        cpR = un.release;
+        if ((n = strcspn(cpR, "0123456789")) > 0)
+            cpR += n;
+        if ((n = strspn(cpR,"0123456789.")) > 0) {
+            /* terminate after "N.N.N...." prefix */
+            cpR[n] = '\0';
+            /* shorten to "N.N" if longer */
+            if ((cp = strchr(cpR, '.')) != NULL) {
+                if ((cp = strchr(cp+1, '.')) != NULL)
+                    *cp = '\0';
+            }
+            strcat(un.sysname, cpR);
+        }
+        /* fix up machine hardware name containing white-space as it
+         * happens to be on Power Macs running MacOS X
+         */
+        if (!strncmp(un.machine, "Power Macintosh", 15)) {
+            sprintf(un.machine, "powerpc");
+        }
+    }
+#else /* OPENPKG */
 #if !defined(__linux__)
 #ifdef SNI
 	/* USUALLY un.sysname on sinix does start with the word "SINIX"
@@ -1298,6 +1336,7 @@
 	    }
 	}
 #	endif
+#endif /* OPENPKG */
 
 	/* the uname() result goes through the arch_canon table */
 	canon = lookupInCanonTable(un.machine,

+---------------------------------------------------------------------------
| Disable "check-files" feature, because it is useless in OpenPKG
| (we consistently use BuildRoot and our %files lists are fully
| autogenerated) and just makes problems on bootstrapping.
| Additionally, do not override the "_host_xx" macros because their
| value (derived from <prefix>/etc/openpkg/platform) is already
| correctly set internally.
+---------------------------------------------------------------------------
Index: macros.in
--- macros.in	2 Jul 2003 19:20:52 -0000	1.1.1.14
+++ macros.in	25 Aug 2003 18:23:11 -0000
@@ -305,7 +305,7 @@
 # Returns list of unpackaged files, i.e. files in $RPM_BUILD_ROOT not packaged.
 #
 # Note: Disable (by commenting out) for legacy compatibility.
-%__check_files         @RPMCONFIGDIR@/check-files %{buildroot}
+#%__check_files         @RPMCONFIGDIR@/check-files %{buildroot}
 
 #
 # Should unpackaged files in a build root terminate a build?
@@ -929,11 +929,11 @@
 %_build_cpu		%{_host_cpu}
 %_build_vendor		%{_host_vendor}
 %_build_os		%{_host_os}
-%_host			@host@
-%_host_alias		@host_alias@%{nil}
-%_host_cpu		@host_cpu@
-%_host_vendor		@host_vendor@
-%_host_os		@host_os@
+#%_host			@host@
+#%_host_alias		@host_alias@%{nil}
+#%_host_cpu		@host_cpu@
+#%_host_vendor		@host_vendor@
+#%_host_os		@host_os@
 %_target		%{_host}
 %_target_alias		%{_host_alias}
 %_target_cpu		%{_host_cpu}

+---------------------------------------------------------------------------
| Adjust path for OpenPKG filesystem layout.
+---------------------------------------------------------------------------
Index: scripts/Makefile.am
--- scripts/Makefile.am	20 Jun 2003 19:04:49 -0000	1.1.1.11
+++ scripts/Makefile.am	26 Aug 2003 07:45:36 -0000
@@ -22,7 +22,7 @@
 
 all:
 
-configdir = ${prefix}/lib/rpm
+configdir = ${prefix}/lib/openpkg
 config_SCRIPTS = \
 	brp-compress brp-python-bytecompile brp-redhat \
 	brp-strip brp-strip-comment-note \

+---------------------------------------------------------------------------
| Adjust path for OpenPKG filesystem layout.
+---------------------------------------------------------------------------
Index: scripts/Makefile.in
--- scripts/Makefile.in	16 Jul 2003 17:05:49 -0000	1.1.1.14
+++ scripts/Makefile.in	26 Aug 2003 07:45:45 -0000
@@ -273,7 +273,7 @@
 
 installprefix = $(DESTDIR)
 
-configdir = ${prefix}/lib/rpm
+configdir = ${prefix}/lib/openpkg
 config_SCRIPTS = \
 	brp-compress brp-python-bytecompile brp-redhat \
 	brp-strip brp-strip-comment-note \

+---------------------------------------------------------------------------
| Use GNU libtool's weaker -static (link with own static libraries)
| instead of the strong -all-static (link even with static libc, etc),
| because OpenPKG does not need to be fully static.
| Additionally, adjust the path to file(1)'s "magic" file.
+---------------------------------------------------------------------------
Index: file/Makefile.am
--- file/Makefile.am	24 Jan 2003 19:41:56 -0000	1.1.1.1
+++ file/Makefile.am	26 Aug 2003 07:44:31 -0000
@@ -36,7 +36,7 @@
 #MAGIC	 = @datadir@/magic
 #data_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
-pkglibdir =  @prefix@/lib/rpm
+pkglibdir =  @prefix@/lib/openpkg
 pkglib_DATA = magic magic.mime magic.mgc magic.mime.mgc
 MAGIC	 = $(pkglibdir)/magic
 CPPFLAGS = -DMAGIC='"$(MAGIC)"'

+---------------------------------------------------------------------------
| Use GNU libtool's weaker -static (link with own static libraries)
| instead of the strong -all-static (link even with static libc, etc),
| because OpenPKG does not need to be fully static.
| Additionally, adjust the path to file(1)'s "magic" file.
+---------------------------------------------------------------------------
Index: file/Makefile.in
--- file/Makefile.in	16 Jul 2003 17:05:23 -0000	1.1.1.2
+++ file/Makefile.in	26 Aug 2003 07:44:20 -0000
@@ -39,7 +39,7 @@
 
 #MAGIC	 = @datadir@/magic
 #data_DATA = magic magic.mime magic.mgc magic.mime.mgc
-pkglibdir = @prefix@/lib/rpm
+pkglibdir = @prefix@/lib/openpkg
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
@@ -159,7 +159,7 @@
 noinst_PROGRAMS = file
 
 file_SOURCES = file.c
-file_LDFLAGS = -all-static
+file_LDFLAGS = -static
 file_LDADD = libfmagic.la
 
 man_MAGIC = magic.@fsect@

+---------------------------------------------------------------------------
| Use GNU libtool's weaker -static (link with own static libraries)
| instead of the strong -all-static (link even with static libc, etc),
| because OpenPKG does not need to be fully static.
| Additionally, disable the building of gettext stuff we don't need.
+---------------------------------------------------------------------------
Index: popt/Makefile.am
--- popt/Makefile.am	6 Mar 2003 23:16:43 -0000	1.1.1.9
+++ popt/Makefile.am	26 Aug 2003 07:42:34 -0000
@@ -9,7 +9,7 @@
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
 
-SUBDIRS = intl po
+SUBDIRS = intl
 
 INCLUDES = -I. -I$(top_srcdir)
 
@@ -17,13 +17,13 @@
 
 noinst_PROGRAMS = test1 test2 test3
 test1_SOURCES = test1.c
-test1_LDFLAGS = -all-static
+test1_LDFLAGS = -static
 test1_LDADD = $(usrlib_LTLIBRARIES)
 test2_SOURCES = test2.c
-test2_LDFLAGS = -all-static
+test2_LDFLAGS = -static
 test2_LDADD = $(usrlib_LTLIBRARIES)
 test3_SOURCES = test3.c
-test3_LDFLAGS = -all-static
+test3_LDFLAGS = -static
 test3_LDADD = $(usrlib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh

+---------------------------------------------------------------------------
| Use GNU libtool's weaker -static (link with own static libraries)
| instead of the strong -all-static (link even with static libc, etc),
| because OpenPKG does not need to be fully static.
| Additionally, disable the building of gettext stuff we don't need.
+---------------------------------------------------------------------------
Index: popt/Makefile.in
--- popt/Makefile.in	16 Jul 2003 17:04:49 -0000	1.1.1.14
+++ popt/Makefile.in	26 Aug 2003 07:42:51 -0000
@@ -163,7 +163,7 @@
 	popt.ps
 
 
-SUBDIRS = intl po
+SUBDIRS = intl
 
 INCLUDES = -I. -I$(top_srcdir)
 
@@ -171,13 +171,13 @@
 
 noinst_PROGRAMS = test1 test2 test3
 test1_SOURCES = test1.c
-test1_LDFLAGS = -all-static
+test1_LDFLAGS = -static
 test1_LDADD = $(usrlib_LTLIBRARIES)
 test2_SOURCES = test2.c
-test2_LDFLAGS = -all-static
+test2_LDFLAGS = -static
 test2_LDADD = $(usrlib_LTLIBRARIES)
 test3_SOURCES = test3.c
-test3_LDFLAGS = -all-static
+test3_LDFLAGS = -static
 test3_LDADD = $(usrlib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh

+---------------------------------------------------------------------------
| Revert back to the old behaviour of passing to "exec" programs an
| extra "--" argument to separate options and arguments. Additionally,
| allow the "!#:+" constructs to be used multiple times and then each
| time eat another argument (instead of just eating an argument once
| and expanding this multiple times).
+---------------------------------------------------------------------------
Index: popt/popt.c
--- popt/popt.c	22 Aug 2002 14:17:44 -0000	1.1.1.12
+++ popt/popt.c	24 Aug 2003 13:10:16 -0000
@@ -400,9 +400,7 @@
     }
 
     if (con->leftovers != NULL && con->numLeftovers > 0) {
-#if 0
 	argv[argc++] = "--";
-#endif
 	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
 	argc += con->numLeftovers;
     }
@@ -580,10 +578,8 @@
 	    if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
 		/*@switchbreak@*/ break;
 	    /* XXX Make sure that findNextArg deletes only next arg. */
-	    if (a == NULL) {
 		if ((a = findNextArg(con, 1, 1)) == NULL)
 		    /*@switchbreak@*/ break;
-	    }
 	    s += 3;
 
 	    alen = strlen(a);

+---------------------------------------------------------------------------
| Dedefine the stdio variable BUFSIZ because it is usually just 1024
| on some platforms (on Linux it is 8192) and unfortunately RPM uses
| it here for the macro expansion buffer. For OpenPKG the size 1024 is
| definetely too small. So increase this to a 16KB buffer.
+---------------------------------------------------------------------------
Index: rpmio/macro.c
--- rpmio/macro.c	15 May 2003 13:42:01 -0000	1.1.1.7
+++ rpmio/macro.c	26 Aug 2003 07:31:04 -0000
@@ -50,6 +50,9 @@
 
 #include "debug.h"
 
+#undef  BUFSIZ
+#define BUFSIZ 16384
+
 #if defined(__LCLINT__)
 /*@-exportheader@*/
 extern const unsigned short int **__ctype_b_loc (void) /*@*/;

+---------------------------------------------------------------------------
| Reactivate build mode aliases which were removed in rpm-4.1 
| (and now should be available through "rpmbuild" only).
+---------------------------------------------------------------------------
Index: rpmpopt.in
--- rpmpopt.in	24 Jan 2003 14:56:30 -0000	1.1.1.7
+++ rpmpopt.in	25 Aug 2003 09:32:31 -0000
@@ -147,28 +147,27 @@
 # Popt glue to preserve legacy CLI behavior.
 #
 # XXX popt exec parsing doesn't honor POPT_ARGFLAG_ONEDASH
-# XXX Build mode aliases, removed in rpm-4.1.
-#rpm	exec --bp		rpmb -bp
-#rpm	exec --bc		rpmb -bc
-#rpm	exec --bi		rpmb -bi
-#rpm	exec --bl		rpmb -bl
-#rpm	exec --ba		rpmb -ba
-#rpm	exec --bb		rpmb -bb
-#rpm	exec --bs		rpmb -bs
-#rpm	exec --tp		rpmb -tp
-#rpm	exec --tc		rpmb -tc
-#rpm	exec --ti		rpmb -ti
-#rpm	exec --tl		rpmb -tl
-#rpm	exec --ta		rpmb -ta
-#rpm	exec --tb		rpmb -tb
-#rpm	exec --ts		rpmb -ts
-#rpm	exec --rebuild		rpmb --rebuild
-#rpm	exec --recompile	rpmb --recompile
-#rpm	exec --clean		rpmb --clean
-#rpm	exec --rmsource		rpmb --rmsource
-#rpm	exec --rmspec		rpmb --rmspec
-#rpm	exec --target		rpmb --target
-#rpm	exec --short-circuit	rpmb --short-circuit
+rpm	exec --bp		rpmb -bp
+rpm	exec --bc		rpmb -bc
+rpm	exec --bi		rpmb -bi
+rpm	exec --bl		rpmb -bl
+rpm	exec --ba		rpmb -ba
+rpm	exec --bb		rpmb -bb
+rpm	exec --bs		rpmb -bs
+rpm	exec --tp		rpmb -tp
+rpm	exec --tc		rpmb -tc
+rpm	exec --ti		rpmb -ti
+rpm	exec --tl		rpmb -tl
+rpm	exec --ta		rpmb -ta
+rpm	exec --tb		rpmb -tb
+rpm	exec --ts		rpmb -ts
+rpm	exec --rebuild		rpmb --rebuild
+rpm	exec --recompile	rpmb --recompile
+rpm	exec --clean		rpmb --clean
+rpm	exec --rmsource		rpmb --rmsource
+rpm	exec --rmspec		rpmb --rmspec
+rpm	exec --target		rpmb --target
+rpm	exec --short-circuit	rpmb --short-circuit
 
 rpm	exec --initdb		rpmd --initdb
 rpm	exec --rebuilddb	rpmd --rebuilddb