X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rpm-rpmpopt.patch;h=f55f4bd3c8f234a90f56be54009776b4f3342b26;hb=2f6105629dbb5f5197bd38eda13b6cd72f2041cd;hp=d965c27d40335714bdbff2a59fdc8bd203b3377a;hpb=80c5dfe17e08a695e803cc4b28f9ab88e7c55524;p=packages%2Frpm.git

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index d965c27..f55f4bd 100644
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,24 +1,6 @@
---- rpm-4.3/rpmpopt.in.orig	2003-02-06 19:02:50.000000000 +0100
-+++ rpm-4.3/rpmpopt.in	2003-06-10 23:55:22.000000000 +0200
-@@ -105,16 +105,11 @@
- 	--POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)"
- 
- # colon separated i18n domains to use as PO catalogue lookaside for
--* retrieving header group/description/summary.
-+# retrieving header group/description/summary.
- #
- # For Red Hat, value should be "redhat-dist:redhat-powertools".
- rpm alias --i18ndomains --define '_i18ndomains !#:+'
- 
--# Build policies enabled from command line. Last policy applies.
--rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
--	--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
--	--POPTargs=$"<policy>"
--
- # Choose db interface:
- #	0	same as 1
- #	1	native db1 interface (e.g. linux glibc libdb1 routines).
-@@ -217,6 +212,15 @@
+--- rpm-4.4.4/rpmpopt.in.orig	2005-10-30 02:15:44.000000000 +0200
++++ rpm-4.4.4/rpmpopt.in	2005-11-18 22:43:57.809703712 +0100
+@@ -246,6 +246,15 @@
  rpmb	alias --without		--define "_without_!#:+    --without-!#:+" \
  	--POPTdesc=$"disable configure <option> for build" \
  	--POPTargs=$"<option>"
@@ -34,10 +16,10 @@
  #==============================================================================
  rpmbuild	alias --dbpath		--define '_dbpath !#:+' \
  	--POPTdesc=$"use database in DIRECTORY" \
-@@ -232,6 +236,19 @@
- rpmbuild alias --without	--define "_without_!#:+  --without-!#:+" \
- 	--POPTdesc=$"disable configure <option> for build" \
- 	--POPTargs=$"<option>"
+@@ -261,6 +270,15 @@
+ rpmbuild alias --buildroot      --define '.buildroot !#:+' \
+ 	--POPTdesc=$"override build root" \
+ 	--POPTargs=$"DIRECTORY"
 +# (PLD-specific) Make RPM build tree
 +rpmbuild exec --install-build-tree install-build-tree \
 +	--POPTdesc=$"make all needed dirs for building binary rpms"
@@ -47,31 +29,27 @@
 +# (PLD-specific) Conditional building
 +rpmbuild exec  --bcond find-spec-bcond \
 +	--POPTdesc=$"find all --with/--without values"
-+# Build policies enabled from command line. Last policy applies.
-+#rpmbuild alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
-+#	--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
-+#	--POPTargs=$"<policy>"
  #==============================================================================
  rpmd	alias --dbpath		--define '_dbpath !#:+' \
  	--POPTdesc=$"use database in DIRECTORY" \
---- rpm-4.3/po/pl.po.orig	2003-06-10 23:48:19.000000000 +0200
-+++ rpm-4.3/po/pl.po	2003-06-10 23:59:11.000000000 +0200
-@@ -3791,6 +3791,18 @@
+--- rpm-4.4.9/po/pl.po.orig	2007-05-22 01:10:34.875893544 +0200
++++ rpm-4.4.9/po/pl.po	2007-05-22 08:08:41.253484731 +0200
+@@ -4509,6 +4509,18 @@
  msgid "disable configure <option> for build"
  msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
  
-+#: ../rpmpopt:217
++#: rpmpopt:251
 +msgid "make all needed dirs for building binary rpms"
 +msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
 +
-+#: ../rpmpopt:220
++#: rpmpopt:254
 +msgid "build packages with debug information"
 +msgstr "buduj pakiety z informacjami do odpluskwiania"
 +
-+#: ../rpmpopt:223
++#: rpmpopt:257
 +msgid "find all --with/--without values"
 +msgstr "znajd¼ wszystkie warto¶ci --with/--without"
 +
- #: ../rpmpopt:186 ../rpmpopt:201 ../rpmpopt:216 ../rpmpopt:224 ../rpmpopt:232
- #: ../rpmpopt:240 ../rpmpopt:248 ../rpmpopt:256 ../rpmpopt:264 ../rpmpopt:337
- #: ../rpmpopt:409 ../rpmpopt:417
+ #: rpmpopt:262 rpmpopt:277 rpmpopt:295 rpmpopt:303
+ #: rpmpopt:311 rpmpopt:319 rpmpopt:327 rpmpopt:335
+ #: rpmpopt:343 rpmpopt:454 rpmpopt:564 rpmpopt:572