- merge rpmpopt patch into popt-aliases patch

diff --git a/rpm-popt-aliases.patch b/rpm-popt-aliases.patch
index 0a8701265883a104f45239f9d00a3b306d23f084..001b73f507a67048cf788efead5dc04eb9959af1 100644 (file)
--- a/rpm-popt-aliases.patch
+++ b/rpm-popt-aliases.patch
@@ -1,5 +1,24 @@
 --- rpm-4.4.9/rpmpopt.in       2008-03-24 22:09:33.709972364 +0200
 +++ rpm-4.4.9/rpmpopt.in       2008-04-04 18:51:45.658923774 +0300
+@@ -240,6 +249,18 @@
+       --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"
++
+ rpmbuild alias --lsb --noautoreq --noautoprov \
+       --define '_use_internal_dependency_generator 0' \
+       --notinlsb
 @@ -595,4 +595,22 @@
  rpmv  alias --httpproxy       --define '_httpproxy !#:+'
  

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
deleted file mode 100644 (file)
index 18e3a0c..0000000
--- a/rpm-rpmpopt.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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"
- 
-+# (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"
-+
- 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

diff --git a/rpm.spec b/rpm.spec
index 32fc2c3d3e7812862610dbd002cb92973af19f20..f0e56dab11bc9ac53e44e758c7f815a7a036e121 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -94,7 +94,6 @@ Source29:     dbupgrade.sh
 Patch0:                %{name}-branch.patch
 Patch1:                %{name}-man_pl.patch
 Patch2:                %{name}-popt-aliases.patch
-Patch3:                %{name}-rpmpopt.patch
 Patch4:                %{name}-perl-macros.patch
 Patch5:                %{name}-perl-req-perlfile.patch
 Patch6:                %{name}-scripts-closefds.patch
@@ -788,7 +787,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 #patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1