- cleanups

NOTE: this snapshot fix 3 important issue:
-- nasted %%if now allowed
-- add version check for package with provides and obsoletes
-- cut-n-paste error setting nopromote for Conflicts
and one candy:
- add ":xml" header format modifier.
- --queryformat '[%%{*:xml}\n]' to dump header content in XML.

Changed files:
    rpm.spec -> 1.421

diff --git a/rpm.spec b/rpm.spec
index cd55be530a479ac8f78eefc27639c8e84f977d84..ff9fa51c38021bddec84be5adbb41b748f5c21b3 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -56,15 +56,11 @@ Patch2:             %{name}-arch.patch
 Patch3:                %{name}-%{name}popt.patch
 Patch4:                %{name}-perl-macros.patch
 Patch5:                %{name}-perl-req-perlfile.patch
-Patch6:                %{name}-cache.patch
 Patch7:                %{name}-glob.patch
-Patch9:                %{name}-fast-alAddPackage.patch
-Patch10:       %{name}-byKey.patch
 Patch11:       %{name}-noexpand.patch
 Patch12:       %{name}-scripts-closefds.patch
 Patch13:       %{name}-python-macros.patch
 Patch16:       %{name}-drop-legacy-CLI.patch
-Patch15:       %{name}-4.1-branch.patch
 Patch18:       %{name}-gettext-in-header.patch
 Patch19:       %{name}-compress-doc.patch
 Patch20:       %{name}-lt14d.patch
@@ -484,13 +480,7 @@ construir pacotes usando o RPM.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-# not needed ? (break compilation)
-#%patch6 -p1
 %patch7 -p1
-# rejected (needed ?)
-#%patch9 -p1
-# too many rejects, Pawel please check if needed and rediff
-#%patch10 -p0
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -543,14 +533,6 @@ rm -f missing
 %{__autoconf}
 %{__automake}
 cd ..
-cd beecrypt
-rm -f missing
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-cd ..
 
 rm -f missing
 %{__libtoolize}