X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-rpmpopt.patch;h=f3adb43f3072293f63da318333e0cbc192bd24c2;hb=1323a2348872a02129d761b1345e9087af10c0d6;hp=91ef08fcf8860cccce6ac6a8c3e79a134a5dd776;hpb=60798fe8fe860ee7c0367a7a885a6f6043a74b5b;p=packages%2Frpm.git

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 91ef08f..f3adb43 100644
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,23 +1,55 @@
-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
+@@ -246,6 +246,15 @@
+ rpmb	alias --without		--define "_without_!#:+    --without-!#:+" \
+ 	--POPTdesc=$"disable configure <option> for build" \
+ 	--POPTargs=$"<option>"
++# (PLD-specific) Make RPM build tree
++rpmb	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
++rpmb	alias --debug --define 'debug 1' \
++	--POPTdesc=$"build packages with debug information"
++# (PLD-specific) Conditional building
++rpmb	exec  --bcond find-spec-bcond \
++	--POPTdesc=$"find all --with/--without values"
+ #==============================================================================
+ rpmbuild	alias --dbpath		--define '_dbpath !#:+' \
+ 	--POPTdesc=$"use database in DIRECTORY" \
+@@ -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"
++# (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"
+ #==============================================================================
+ rpmd	alias --dbpath		--define '_dbpath !#:+' \
+ 	--POPTdesc=$"use database in DIRECTORY" \
+--- rpm-4.4.2/po/pl.po.orig	2005-07-23 14:59:24.279380584 +0200
++++ rpm-4.4.2/po/pl.po	2005-07-23 15:08:13.952857976 +0200
+@@ -4387,6 +4387,18 @@
+ msgid "disable configure <option> for build"
+ msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
  
-+# Make RPM build tree
-+rpm exec --install-build-tree install-build-tree
++#: ../rpmpopt:251
++msgid "make all needed dirs for building binary rpms"
++msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
 +
-+# Compiling with debuginfo may be enabled by --debug
-+rpm alias --debug --define 'debug 1'
++#: ../rpmpopt:254
++msgid "build packages with debug information"
++msgstr "buduj pakiety z informacjami do odpluskwiania"
 +
-+# Conditional building 
-+rpm exec  --bcond   find-spec-bcond
-+rpm alias --with    --define "bcond_on_!#:+ 1"
-+rpm alias --without --define "bcond_off_!#:+ 1"
++#: ../rpmpopt:257
++msgid "find all --with/--without values"
++msgstr "znajd¼ wszystkie warto¶ci --with/--without"
 +
-+# Don't remove $BUILDROOT if --noclean
-+
- # Choose db interface:
- #	0	same as 1
- #	1	native db1 interface (e.g. linux glibc libdb1 routines).
+ #: ../rpmpopt:186 ../rpmpopt:201 ../rpmpopt:216 ../rpmpopt:224 ../rpmpopt:232
+ #: ../rpmpopt:240 ../rpmpopt:248 ../rpmpopt:256 ../rpmpopt:264 ../rpmpopt:337
+ #: ../rpmpopt:409 ../rpmpopt:417