- add --norepackage option to rpm

Changed files:
    rpm-popt-aliases.patch -> 1.3
    rpm.spec -> 1.891

diff --git a/rpm-popt-aliases.patch b/rpm-popt-aliases.patch
index c87d727f376b39739464fc6025af38e26f445717..23e8154c301e8731f11d50937577fa3d05647aa3 100644 (file)
--- a/rpm-popt-aliases.patch
+++ b/rpm-popt-aliases.patch
@@ -1,6 +1,6 @@
---- ./rpmpopt.in       2008-03-13 16:18:11.169818380 +0200
-+++ rpm-4.4.9/rpmpopt.in       2008-03-24 22:09:33.709972364 +0200
-@@ -595,4 +595,13 @@
+--- 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
+@@ -595,4 +595,16 @@
  rpmv  alias --httpproxy       --define '_httpproxy !#:+'
  
 +rpm   alias --downgrade       --oldpackage \
@@ -11,6 +11,9 @@
 +
 +rpm alias --what-requires --whatrequires \
 +      --POPTdesc=$"find package name that contains a required capability"
++
++rpm alias --norepackage --define '_repackage_all_erasures 0' \
++      --POPTdesc=$"Disable re-package of the files before erasing"
 +
  # \endverbatim
  #*/

diff --git a/rpm.spec b/rpm.spec
index 0c0ac3ade0ff68a569970188995188007852dcbd..9253860dd201418e4e5c10dd6f70a75003e7754a 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -103,7 +103,7 @@ Source111:  %{name}-macros-amd64
 
 #Patch0:               %{name}-pl.po.patch
 Patch1:                %{name}-man_pl.patch
-Patch2:                %{name}-popt-downgrade.patch
+Patch2:                %{name}-popt-aliases.patch
 Patch3:                %{name}-rpmpopt.patch
 Patch4:                %{name}-perl-macros.patch
 Patch5:                %{name}-perl-req-perlfile.patch