From 3d0335a94e25f171e71432830fe2ce1ef6eba4ea8afce780e28e219f4a8b897f Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Fri, 5 Sep 2014 23:05:53 +0000 Subject: [PATCH 1/2] Accepting request 247770 from home:dnh:branches:Base:System update to 4.8.13 OBS-URL: https://build.opensuse.org/request/show/247770 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=91 --- mc-4.8.12.tar.xz | 3 --- mc-4.8.13.tar.xz | 3 +++ mc-esc-seq.patch | 8 ++++---- mc-rpmlintrc | 1 + mc.changes | 7 +++++++ mc.desktop | 1 + mc.spec | 24 +++++++++++++++++++----- 7 files changed, 35 insertions(+), 12 deletions(-) delete mode 100644 mc-4.8.12.tar.xz create mode 100644 mc-4.8.13.tar.xz diff --git a/mc-4.8.12.tar.xz b/mc-4.8.12.tar.xz deleted file mode 100644 index 9121e36..0000000 --- a/mc-4.8.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe -size 2237892 diff --git a/mc-4.8.13.tar.xz b/mc-4.8.13.tar.xz new file mode 100644 index 0000000..00b6c17 --- /dev/null +++ b/mc-4.8.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657 +size 2231448 diff --git a/mc-esc-seq.patch b/mc-esc-seq.patch index b50dd46..373052c 100644 --- a/mc-esc-seq.patch +++ b/mc-esc-seq.patch @@ -1,7 +1,7 @@ ---- lib/util.c.orig 2013-07-09 14:43:17.000000000 +0400 -+++ lib/util.c 2013-07-11 18:48:01.258511499 +0400 -@@ -745,6 +745,8 @@ - while (*(++r) != '\0' && strchr ("0123456789;?", *r) != NULL) +--- lib/util.c.orig 2014-09-05 20:50:09.000000000 +0200 ++++ lib/util.c 2014-09-05 20:51:02.000000000 +0200 +@@ -748,6 +748,8 @@ strip_ctrl_codes (char *s) + while (*(++r) != '\0' && strchr ("0123456789;:?", *r) != NULL) ; } + else if (*r == '(') diff --git a/mc-rpmlintrc b/mc-rpmlintrc index 6e91c2f..b391e31 100644 --- a/mc-rpmlintrc +++ b/mc-rpmlintrc @@ -1,2 +1,3 @@ addFilter("mc\..* W: script-without-shebang /usr/lib/mc/fish/.+") addFilter("mc\..* W: script-without-shebang /usr/share/mc/mc.*\.c?sh") +addFilter("mc\..* W: files-duplicate /etc/mc/mc.keymap") diff --git a/mc.changes b/mc.changes index 3962825..e8f57c2 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 5 18:37:47 UTC 2014 - dnh@opensuse.org + +- update to 4.8.13 + various bugfixes and minor improvements, see NEWS file for details +- comment out mc-Syntax.cmake.patch, fixed upstream, to be removed + ------------------------------------------------------------------- Wed Apr 2 19:35:48 UTC 2014 - dnh@opensuse.org diff --git a/mc.desktop b/mc.desktop index d1abf92..0843b5b 100644 --- a/mc.desktop +++ b/mc.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Type=Application Name=Midnight Commander +GenericName=File Manager Exec=mc Terminal=true Icon=mc diff --git a/mc.spec b/mc.spec index b0489b5..3dd63db 100644 --- a/mc.spec +++ b/mc.spec @@ -21,7 +21,7 @@ Summary: Midnight Commander License: GPL-3.0+ Group: Productivity/File utilities Url: http://midnight-commander.org/ -Version: 4.8.12 +Version: 4.8.13 Release: 0 #Git-Clone: git://github.com/MidnightCommander/mc @@ -31,7 +31,8 @@ Source2: %{name}.desktop Source3: %{name}.png Source4: cmake.syntax Source5: mc-rpmlintrc -Patch18: mc-Syntax.cmake.patch +# 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 @@ -118,7 +119,7 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension. %patch12 %patch16 %patch17 -p1 -%patch18 +#%patch18 %patch20 %patch21 %patch22 -p1 @@ -159,6 +160,14 @@ ln -fs -t %{buildroot}%{_sysconfdir}/profile.d %{_datadir}/mc/mc.{,c}sh #support script for calling available GUI webbrosers install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/ install -D -m 644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -D -m 644 %{S:3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png + +for f in ext.d/misc.sh ext.d/sound.sh ext.d/video.sh \ + extfs.d/gitfs+ extfs.d/uace extfs.d/uarc ; +do + sed -i -e '1s@bin/sh@bin/bash@' "%{buildroot}%{_libexecdir}/mc/${f}" +done + %suse_update_desktop_file -i %name System FileManager # Remove not supported language rm -rf %{buildroot}%{_datadir}/locale/be@tarask @@ -193,7 +202,9 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %config %{_sysconfdir}/mc/mc.default.keymap %config %{_sysconfdir}/mc/mc.emacs.keymap %config %{_sysconfdir}/mc/edit.indent.rc -#(!)dir #{_libexecdir}/mc +%dir %{_libexecdir}/mc +%{_libexecdir}/mc/ext.d +%{_libexecdir}/mc/extfs.d %verify(not mode) %{_libexecdir}/mc/cons.saver %{_mandir}/man1/* %exclude %{_mandir}/*/man1/* @@ -201,7 +212,6 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %{_datadir}/mc/syntax/Syntax %{_datadir}/mc/mc.charsets %{_datadir}/mc/mc.lib -%{_libexecdir}/mc %{_datadir}/mc/hints/mc.hint %exclude %{_datadir}/mc/hints/mc.hint.* %{_datadir}/mc/help/mc.hlp @@ -211,6 +221,10 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/32x32 +%dir %{_datadir}/icons/hicolor/32x32/apps +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %exclude %{_sysconfdir}/mc/mc.menu.* %files lang -f %name.lang From 81e0d902db172fa395b3230f571d4cee5449178ccf2cfd4a68b825f7bd263aef Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 6 Sep 2014 03:56:09 +0000 Subject: [PATCH 2/2] Accepting request 247795 from home:dnh:branches:Base:System remove "obsolete" patches OBS-URL: https://build.opensuse.org/request/show/247795 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=92 --- mc-Syntax.cmake.patch | 11 ----------- mc-vfs_fish_helpers_ls-formatstring.diff | 18 ------------------ mc.changes | 7 +++++++ mc.spec | 3 --- 4 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 mc-Syntax.cmake.patch delete mode 100644 mc-vfs_fish_helpers_ls-formatstring.diff 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