restore macros.lang file from 4.5 branch (f622fc6)

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

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 99c5fe468b8c9df1a2a8079ed18ca5d10e2b1443..18e3a0cdfb38358ac460f4c59bca1741e8fca4ea 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,21 +1,5 @@
 --- 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
-@@ -221,6 +221,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" \
 @@ -240,6 +249,16 @@
        --POPTdesc=$"override build root" \
        --POPTargs=$"DIRECTORY"