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

Accepting request 247795 from home:dnh:branches:Base:System

Browse Source 
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
This commit is contained in:
OBS User mrdocs 2014-09-06 03:56:09 +00:00 committed by Git OBS Bridge
parent 3d0335a94e
commit 81e0d902db
4 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

7
mc.changes
View File

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

3
mc.spec
View File

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