- pld patch is back

Changed files:
    mc-pld-developerfriendly.patch -> 1.6
    mc.spec -> 1.287

diff --git a/mc-pld-developerfriendly.patch b/mc-pld-developerfriendly.patch
index c8b4160895364aa8e35c78b7f390c1fa66585795..9060d7ee2de71c01c8c46259d4ba22e906d61775 100644 (file)
--- a/mc-pld-developerfriendly.patch
+++ b/mc-pld-developerfriendly.patch
@@ -25,25 +25,14 @@ diff -urN mc-2006-02-24-22.org/syntax/cvs-userlist.syntax mc-2006-02-24-22/synta
 diff -urN mc-2006-02-24-22.org/syntax/Makefile.am mc-2006-02-24-22/syntax/Makefile.am
 --- mc-2006-02-24-22.org/syntax/Makefile.am    2006-01-30 18:01:58.000000000 +0100
 +++ mc-2006-02-24-22/syntax/Makefile.am        2006-02-28 17:38:02.617073750 +0100
-@@ -6,13 +6,14 @@
-       awk.syntax              \
-       c.syntax                \
-       changelog.syntax        \
--      debian-changelog.syntax \
--      debian-control.syntax   \
-+      debian-changelog.syntax \
-+      debian-control.syntax   \
-       debian-description.syntax \
--      debian-sources-list.syntax \
-+      debian-sources-list.syntax \
+@@ -11,6 +11,7 @@
+       debian-sources-list.syntax \
        cs.syntax               \
        css.syntax              \
--  cxx.syntax      \
 +      cvs-userlist.syntax     \
-+      cxx.syntax              \
+       cxx.syntax              \
        d.syntax                \
        diff.syntax             \
-       dos.syntax              \
 @@ -35,6 +36,7 @@
        pascal.syntax           \
        perl.syntax             \
@@ -52,36 +41,6 @@ diff -urN mc-2006-02-24-22.org/syntax/Makefile.am mc-2006-02-24-22/syntax/Makefi
        po.syntax               \
        povray.syntax           \
        python.syntax           \
-diff -urN mc-2006-02-24-22.org/syntax/Makefile.in mc-2006-02-24-22/syntax/Makefile.in
---- mc-2006-02-24-22.org/syntax/Makefile.in    2006-02-24 23:36:58.000000000 +0100
-+++ mc-2006-02-24-22/syntax/Makefile.in        2006-02-28 17:38:24.266426750 +0100
-@@ -229,13 +229,14 @@
-       assembler.syntax        \
-       c.syntax                \
-       changelog.syntax        \
--      debian-changelog.syntax \
--      debian-control.syntax   \
-+      debian-changelog.syntax \
-+      debian-control.syntax   \
-       debian-description.syntax \
--      debian-sources-list.syntax \
-+      debian-sources-list.syntax \
-       cs.syntax               \
-       css.syntax              \
--  cxx.syntax      \
-+      cvs-userlist.syntax     \
-+      cxx.syntax              \
-       d.syntax                \
-       diff.syntax             \
-       dos.syntax              \
-@@ -258,6 +259,7 @@
-       pascal.syntax           \
-       perl.syntax             \
-       php.syntax              \
-+      pld-update-todo.syntax  \
-       po.syntax               \
-       povray.syntax           \
-       python.syntax           \
 diff -urN mc-2006-02-24-22.org/syntax/pld-update-todo.syntax mc-2006-02-24-22/syntax/pld-update-todo.syntax
 --- mc-2006-02-24-22.org/syntax/pld-update-todo.syntax 1970-01-01 01:00:00.000000000 +0100
 +++ mc-2006-02-24-22/syntax/pld-update-todo.syntax     2006-02-28 17:37:11.805898250 +0100

diff --git a/mc.spec b/mc.spec
index fee06e00c895acf42b2fa00babc16055d8343594..75427c7047918f5dd8e46e4dab4ab1ed64a6b05e 100644 (file)
--- a/mc.spec
+++ b/mc.spec
@@ -232,8 +232,7 @@ cp -f vfs/extfs/{rpm,srpm}
 # doesn't apply
 #%patch8 -p1
 %{!?with_perl_vfs:%patch11 -p1}
-# doesn't apply
-#%patch12 -p1
+%patch12 -p1
 %patch16 -p1
 %patch17 -p1
 %if "%{pld_release}" == "ti"