pool/mc
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 247799 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/247799
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=63
This commit is contained in:
Stephan Kulow 2014-09-06 10:19:04 +00:00 committed by Git OBS Bridge
commit efc2ee4ab9
9 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mc-4.8.12.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe
size 2237892

3
mc-4.8.13.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657
size 2231448

11
mc-Syntax.cmake.patch
View File

@ -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

8
mc-esc-seq.patch
View File

@ -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 == '(')

1
mc-rpmlintrc
View File

@ -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")

18
mc-vfs_fish_helpers_ls-formatstring.diff
View File

@ -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");

14
mc.changes
View File

@ -1,3 +1,17 @@
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
- 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

1
mc.desktop
View File

@ -1,6 +1,7 @@
[Desktop Entry]
Type=Application
Name=Midnight Commander
GenericName=File Manager
Exec=mc
Terminal=true
Icon=mc

21
mc.spec
View File

@ -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,6 @@ Source2: %{name}.desktop
Source3: %{name}.png
Source4: cmake.syntax
Source5: mc-rpmlintrc
Patch18: mc-Syntax.cmake.patch
Patch0: mc-fix_lib_search_path.patch
Patch61: mc-extd-misc.patch
Patch62: mc-extd-video.patch
@ -118,7 +117,6 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension.
%patch12
%patch16
%patch17 -p1
%patch18
%patch20
%patch21
%patch22 -p1
@ -159,6 +157,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 +199,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 +209,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 +218,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