- force initial __cc,__cxx,__cpp to stabilize build env. and avoid poisoning

[packages/rpm.git] / rpm-rpmpopt.patch

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 9be392b4661b56f7474a4af1ba52310c58f47ac7..5614cf90f8422fac6efe4c94480208da07db183d 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,8 +1,41 @@
---- rpm-3.0.3/rpmpopt.wiget    Fri Sep 24 03:50:04 1999
-+++ rpm-3.0.3/rpmpopt  Tue Oct 19 16:56:16 1999
-@@ -72,3 +72,5 @@
+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,21 @@
+ # Build policies enabled from command line. Last policy applies.
+ rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
  
- rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides
- rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires
++# Make RPM build tree
++rpm exec --install-build-tree install-build-tree \
++      --POPTdesc=$"make all needed dirs for building binary rpms"
 +
-+rpm exec --install-build-tree install-build-tree
++# Compiling with debuginfo may be enabled by --debug
++rpm alias --debug --define 'debug 1' \
++      --POPTdesc=$"build packages with debug informations"
++rpmb alias --debug --define 'debug 1' \
++      --POPTdesc=$"build packages with debug informations"
++rpmbuild alias --debug --define 'debug 1' \
++      --POPTdesc=$"build packages with debug informations"
++
++# Conditional building 
++rpm exec  --bcond   find-spec-bcond \
++      --POPTdesc=$"find all --with/--without values"
+ # Choose db interface:
+ #     0       same as 1
+ #     1       native db1 interface (e.g. linux glibc libdb1 routines).
+--- rpm-4.1/po/pl.po.orig      Wed Oct 23 23:01:03 2002
++++ rpm-4.1/po/pl.po   Wed Oct 23 23:11:20 2002
+@@ -3789,4 +3789,13 @@
+ #: ../rpmpopt:410 ../rpmpopt:418
+ msgid "DIRECTORY"
+ msgstr "KATALOG"
++
++msgid "make all needed dirs for building binary rpms"
++msgstr "utwórz wszystkie katalogi potrzebne do budowania pakietów RPM"
++
++msgid "build packages with debug informations"
++msgstr "buduj pakiety z informacjami do odpluskwiania"
++
++msgid "find all --with/--without values"
++msgstr "znajd¼ wszystkie u¿ywane --with/--without"
+