- no repackage in rpm.org

diff --git a/macros.local b/macros.local
index 70b7121a4e171965172e2669b83ac3483a85b7ea..99fd53e6ba7dd28ea58648c0e2946c0478df8710 100644 (file)
--- a/macros.local
+++ b/macros.local
@@ -5,9 +5,6 @@
 %_install_file_context_path    %{nil}
 %_verify_file_context_path     %{nil}
 
 %_install_file_context_path    %{nil}
 %_verify_file_context_path     %{nil}
 

-# If non-zero (default), all erasures will be automagically repackaged.
-#%_repackage_all_erasures      0
-

 # Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
 # marked as %doc should be installed.
 #%_excludedocs                 1
 # Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
 # marked as %doc should be installed.
 #%_excludedocs                 1

diff --git a/rpm-popt-aliases.patch b/rpm-popt-aliases.patch
index 61230b04339d1beeb6ae5eda3fc7b60ad4285e37..8166b08600931a174c0de50c2cabc1d8fc8b154d 100644 (file)
--- a/rpm-popt-aliases.patch
+++ b/rpm-popt-aliases.patch
@@ -1,6 +1,6 @@
 --- 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
 --- 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,5 +249,42 @@
+@@ -240,5 +246,39 @@

        --POPTdesc=$"trace macro expansion"
  rpmspec alias --nodebuginfo   --define 'debug_package %{nil}' \
        --POPTdesc=$"do not generate debuginfo for this package"
        --POPTdesc=$"trace macro expansion"
  rpmspec alias --nodebuginfo   --define 'debug_package %{nil}' \
        --POPTdesc=$"do not generate debuginfo for this package"


@@ -35,9 +35,6 @@
 +rpm alias --what-requires --whatrequires \
 +      --POPTdesc=$"find package name that contains a required capability"
 +
 +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"
-+

 +rpmbuild alias --disable-debuginfo --define '_enable_debug_packages 0' \
 +   --POPTdesc=$"Disable debuginfo package creation"
 +
 +rpmbuild alias --disable-debuginfo --define '_enable_debug_packages 0' \
 +   --POPTdesc=$"Disable debuginfo package creation"
 +