X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-rpmpopt.patch;h=18e3a0cdfb38358ac460f4c59bca1741e8fca4ea;hb=1fcc9b697ab46dea8df3be15bf8ae969ec50c9f0;hp=465b96b7875f103422ab7777e3c43185e9b138c2;hpb=2d8f7c6837e712be383922c501ac3e6b602f5dde;p=packages%2Frpm.git

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 465b96b..18e3a0c 100644
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,23 +1,40 @@
-diff -Nru rpm-4.0/rpmpopt.in rpm-4.0.new/rpmpopt.in
---- rpm-4.0/rpmpopt.in	Wed Nov 15 19:18:35 2000
-+++ rpm-4.0.new/rpmpopt.in	Wed Nov 15 19:18:15 2000
-@@ -80,6 +80,19 @@
- # Build policies enabled from command line. Last policy applies.
- rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
+--- 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
+@@ -240,6 +249,16 @@
+ 	--POPTdesc=$"override build root" \
+ 	--POPTargs=$"DIRECTORY"
  
-+# Make RPM build tree
-+rpm exec --install-build-tree install-build-tree
++# (PLD-specific) Make RPM build tree
++rpmbuild exec --install-build-tree install-build-tree \
++	--POPTdesc=$"make all needed dirs for building binary rpms"
++# (PLD-specific) Compiling with debuginfo may be enabled by --debug
++rpmbuild alias --debug --define 'debug 1' \
++	--POPTdesc=$"build packages with debug information"
++# (PLD-specific) Conditional building
++rpmbuild exec  --bcond find-spec-bcond \
++	--POPTdesc=$"find all --with/--without values"
 +
-+# Compiling with debuginfo may be enabled by --debug
-+rpm alias --debug --define 'debug 1'
-+
-+# Conditional building 
-+rpm exec  --bcond   find-spec-bcond
-+rpm alias --with    --define "_with_!#:+       --with-!#:+"
-+rpm alias --without --define "_without_!#:+       --without-!#:+"
-+
-+# Don't remove $BUILDROOT if --noclean
-+
- # Choose db interface:
- #	0	same as 1
- #	1	native db1 interface (e.g. linux glibc libdb1 routines).
+ rpmbuild alias --lsb --noautoreq --noautoprov \
+ 	--define '_use_internal_dependency_generator 0' \
+ 	--notinlsb
+;--- 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:251
+;+msgid "make all needed dirs for building binary rpms"
+;+msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
+;+
+;+#: rpmpopt:254
+;+msgid "build packages with debug information"
+;+msgstr "buduj pakiety z informacjami do odpluskwiania"
+;+
+;+#: rpmpopt:257
+;+msgid "find all --with/--without values"
+;+msgstr "znajd¼ wszystkie warto¶ci --with/--without"
+;+
+; #: rpmpopt:262 rpmpopt:277 rpmpopt:295 rpmpopt:303
+; #: rpmpopt:311 rpmpopt:319 rpmpopt:327 rpmpopt:335
+; #: rpmpopt:343 rpmpopt:454 rpmpopt:564 rpmpopt:572