diff --git a/mc-Syntax.cmake.patch b/mc-Syntax.cmake.patch deleted file mode 100644 index 833470e..0000000 --- a/mc-Syntax.cmake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/syntax/Syntax.in.orig 2013-06-25 23:29:14.000000000 +0200 -+++ misc/syntax/Syntax.in 2013-08-23 21:55:31.216822402 +0200 -@@ -67,7 +67,7 @@ - file (.\*[Mm]akefile[\\\.A-Za-z0-9]\*|..\*\\.mk|..\*\\.mak|Kbuild)$ Makefile - include makefile.syntax - --file CMakeLists.txt$ CMake -+file (\/CMakeLists.txt|.cmake)$ CMake - include cmake.syntax - - file ..\*\\.(pp|PP|pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram diff --git a/mc-vfs_fish_helpers_ls-formatstring.diff b/mc-vfs_fish_helpers_ls-formatstring.diff deleted file mode 100644 index ff567c6..0000000 --- a/mc-vfs_fish_helpers_ls-formatstring.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- src/vfs/fish/helpers/ls.orig 2013-04-10 22:04:31.000000000 +0200 -+++ src/vfs/fish/helpers/ls 2014-03-15 15:35:18.000000000 +0100 -@@ -137,9 +137,13 @@ - if (S_ISLNK ($mode)) { - my $linkname = readlink ("$dirname/$filename"); - $linkname =~ $strutils_shell_escape_regex; -- printf("R%%o %%o $uid.$gid\nS$size\nd$mloctime\n:\"$e_filename\" -> \"$linkname\"\n\n", S_IMODE($mode), S_IFMT($mode)); -+ printf("R%%o %%o %%i.%%i\nS%%lld\nd%%s\n:\"%%s\" -> \"%%s\"\n\n", -+ S_IMODE($mode), S_IFMT($mode), -+ $uid, $gid, $size, $mloctime, $e_filename, $linkname); - } else { -- printf("R%%o %%o $uid.$gid\nS$size\nd$mloctime\n:\"$e_filename\"\n\n", S_IMODE($mode), S_IFMT($mode)); -+ printf("R%%o %%o %%i.%%i\nS%%lld\nd%%s\n:\"%%s\"\n\n", -+ S_IMODE($mode), S_IFMT($mode), -+ $uid, $gid, $size, $mloctime, $e_filename); - } - } - printf("### 200\n"); diff --git a/mc.changes b/mc.changes index e8f57c2..f43daa2 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,10 @@ +Sat Sep 6 01:40:44 UTC 2014 - dnh@opensuse.org + +- remove file mc-Syntax.cmake.patch / cmds in .spec +- remove file mc-vfs_fish_helpers_ls-formatstring.diff + (extraneous patches seem to cause factory-auto to decline the submit) + cf. e.g. https://build.opensuse.org/request/show/247789 + ------------------------------------------------------------------- Fri Sep 5 18:37:47 UTC 2014 - dnh@opensuse.org diff --git a/mc.spec b/mc.spec index 3dd63db..6559a56 100644 --- a/mc.spec +++ b/mc.spec @@ -31,8 +31,6 @@ Source2: %{name}.desktop Source3: %{name}.png Source4: cmake.syntax Source5: mc-rpmlintrc -# fixed upstream, disable for now, remove with next update -#Patch18: mc-Syntax.cmake.patch Patch0: mc-fix_lib_search_path.patch Patch61: mc-extd-misc.patch Patch62: mc-extd-video.patch @@ -119,7 +117,6 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension. %patch12 %patch16 %patch17 -p1 -#%patch18 %patch20 %patch21 %patch22 -p1