- updated x32 patch

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 7f64ab94fa85ea8b5422ae97bc5edaf919f311e2..8a61567350afc8eee46013a0981ad395591ac336 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -90,7 +90,6 @@ Patch18:      %{name}-javadeps.patch
 Patch20:       %{name}-libtool-deps.patch
 Patch29:       %{name}-builddir-readlink.patch
 Patch30:       %{name}-changelog_order_check_nonfatal.patch
-Patch35:       %{name}-namespace-compare.patch
 Patch37:       %{name}-postun-nofail.patch
 Patch61:       %{name}-clean-docdir.patch
 Patch64:       %{name}-fix-compress-doc.patch
@@ -662,17 +661,16 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch14 -p0
 %patch15 -p1
 #%patch16 -p1
-#%patch18 -p1
+%patch18 -p1
 %patch20 -p1
 %patch29 -p1
 %patch30 -p1
-#%patch35 -p1
 %patch37 -p1
 %patch61 -p1
 #%patch64 -p1
 %patch81 -p1
 %patch83 -p1
-#%patch84 -p1
+%patch84 -p1
 
 install %{SOURCE2} pld.in
 install %{SOURCE8} scripts/php.prov.in
@@ -1040,7 +1038,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/platform/amd64*
 %{_rpmlibdir}/platform/ia32e*
 %{_rpmlibdir}/platform/x86_64*
-#%{_rpmlibdir}/platform/x32*
+%{_rpmlibdir}/platform/x32*
 %endif
 %ifarch alpha
 %{_rpmlibdir}/platform/alpha*