- renumbered patches

diff --git a/rpm.spec b/rpm.spec
index a85bab35da7088461a8d065a8950247ce737fbae..72a878306e4af7ce2936c84a191015f810e8af15 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -88,43 +88,43 @@ Patch6:             %{name}-scripts-closefds.patch
 Patch7:                %{name}-php-macros.patch
 Patch8:                %{name}-gettext-in-header.patch
 Patch9:                %{name}-lua.patch
-Patch11:       %{name}-php-deps.patch
-Patch13:       %{name}-notsc.patch
-Patch14:       %{name}-hack-norpmlibdep.patch
-Patch15:       %{name}-epoch0.patch
-Patch16:       %{name}-perl_req-INC_dirs.patch
-Patch17:       %{name}-debuginfo.patch
-Patch18:       vendor-pld.patch
-Patch19:       %{name}-old-fileconflicts-behaviour.patch
-Patch20:       %{name}-javadeps.patch
-Patch21:       %{name}-truncate-cvslog.patch
-Patch22:       %{name}-libtool-deps.patch
-Patch23:       %{name}-mimetype.patch
-Patch24:       %{name}-sparc64.patch
-Patch25:       %{name}-gendiff.patch
-Patch26:       openmp.patch
-Patch27:       %{name}-URPM-build-fix.patch
-Patch28:       %{name}-db5.3.patch
-Patch29:       %{name}-helperEVR-noassert.patch
-Patch30:       %{name}-unglobal.patch
-Patch31:       %{name}-builddir-readlink.patch
-Patch32:       %{name}-changelog_order_check_nonfatal.patch
-Patch33:       %{name}-cleanbody.patch
-Patch34:       %{name}-dirdeps-macro.patch
-Patch35:       %{name}-installbeforeerase.patch
-Patch36:       %{name}-libmagic-locale.patch
-Patch37:       %{name}-namespace-compare.patch
-Patch38:       %{name}-popt-coreutils.patch
-Patch39:       %{name}-postun-nofail.patch
-Patch40:       %{name}-silence-RPM_CHAR_TYPE.patch
-Patch41:       %{name}-fix-missing-types-in-headers.patch
-Patch43:       %{name}-fix--p-interpreter-and-empty-script.patch
-Patch44:       %{name}-db_buffer_small.patch
-Patch45:       %{name}-pattern_Release.patch
-Patch46:       %{name}-fix-___build_pre-macro.patch
-Patch47:       %{name}-missing-patch-file-fails-build.patch
-Patch48:       %{name}-remove-misleading-missing-patch-message.patch
-Patch49:       %{name}-file-magic-can-be-mixed-case.patch
+Patch10:       %{name}-php-deps.patch
+Patch11:       %{name}-notsc.patch
+Patch12:       %{name}-hack-norpmlibdep.patch
+Patch13:       %{name}-epoch0.patch
+Patch14:       %{name}-perl_req-INC_dirs.patch
+Patch15:       %{name}-debuginfo.patch
+Patch16:       vendor-pld.patch
+Patch17:       %{name}-old-fileconflicts-behaviour.patch
+Patch18:       %{name}-javadeps.patch
+Patch19:       %{name}-truncate-cvslog.patch
+Patch20:       %{name}-libtool-deps.patch
+Patch21:       %{name}-mimetype.patch
+Patch22:       %{name}-sparc64.patch
+Patch23:       %{name}-gendiff.patch
+Patch24:       openmp.patch
+Patch25:       %{name}-URPM-build-fix.patch
+Patch26:       %{name}-db5.3.patch
+Patch27:       %{name}-helperEVR-noassert.patch
+Patch28:       %{name}-unglobal.patch
+Patch29:       %{name}-builddir-readlink.patch
+Patch30:       %{name}-changelog_order_check_nonfatal.patch
+Patch31:       %{name}-cleanbody.patch
+Patch32:       %{name}-dirdeps-macro.patch
+Patch33:       %{name}-installbeforeerase.patch
+Patch34:       %{name}-libmagic-locale.patch
+Patch35:       %{name}-namespace-compare.patch
+Patch36:       %{name}-popt-coreutils.patch
+Patch37:       %{name}-postun-nofail.patch
+Patch38:       %{name}-silence-RPM_CHAR_TYPE.patch
+Patch39:       %{name}-fix-missing-types-in-headers.patch
+Patch40:       %{name}-fix--p-interpreter-and-empty-script.patch
+Patch41:       %{name}-db_buffer_small.patch
+Patch42:       %{name}-pattern_Release.patch
+Patch43:       %{name}-fix-___build_pre-macro.patch
+Patch44:       %{name}-missing-patch-file-fails-build.patch
+Patch45:       %{name}-remove-misleading-missing-patch-message.patch
+Patch46:       %{name}-file-magic-can-be-mixed-case.patch
 
 # Patches imported from Mandriva
 
@@ -752,26 +752,28 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch7 -p1
 %patch8 -p1
 %{?with_system_lua:%patch9 -p1}
-%patch11 -p1
+%patch10 -p1
 %ifnarch i386 i486
 # enable TSC for capable archs
-%patch13 -p1
+%patch11 -p1
 %endif
-%patch14 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p0
 %patch15 -p1
-%patch16 -p0
+%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%ifarch sparc64
 %patch22 -p1
+%endif
 %patch23 -p1
-%ifarch sparc64
 %patch24 -p1
-%endif
 %patch25 -p1
-%patch26 -p1 -b .wiget
+%patch26 -p1
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
@@ -787,13 +789,11 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 %patch43 -p1
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
 
 %patch1000 -p1
 %patch1001 -p1