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

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 465b96b..1d1113e 100644
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,23 +1,77 @@
-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.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)"
  
-+# Make RPM build tree
-+rpm exec --install-build-tree install-build-tree
-+
-+# 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
-+
+ # 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 @@
+ 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" \
+@@ -232,6 +236,19 @@
+ rpmbuild alias --without	--define "_without_!#:+  --without-!#:+" \
+ 	--POPTdesc=$"disable configure <option> for build" \
+ 	--POPTargs=$"<option>"
++# (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"
++# 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/po/pl.po.orig	2005-01-16 21:16:12.259536368 +0100
++++ rpm/po/pl.po	2005-01-16 21:17:45.817313424 +0100
+@@ -4379,6 +4379,18 @@
+ msgid "disable configure <option> for build"
+ msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
+ 
++#: ../rpmpopt:217
++msgid "make all needed dirs for building binary rpms"
++msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
++
++#: ../rpmpopt:220
++msgid "build packages with debug information"
++msgstr "buduj pakiety z informacjami do odpluskwiania"
++
++#: ../rpmpopt:223
++msgid "find all --with/--without values"
++msgstr "znajd¼ wszystkie warto¶ci --with/--without"
++
+ #: ../rpmpopt:216 ../rpmpopt:231 ../rpmpopt:246 ../rpmpopt:254 ../rpmpopt:262
+ #: ../rpmpopt:270 ../rpmpopt:278 ../rpmpopt:286 ../rpmpopt:294 ../rpmpopt:389
+ #: ../rpmpopt:483 ../rpmpopt:491