commit bb56503b575ed5efa1575a817e8a642e4ec79c3c
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Dec 5 19:12:13 2013 +0100
- up to 4.8.11
mc-rpmfs.patch | 49 ++++---------------------------------------------
mc.spec | 4 ++--
2 files changed, 6 insertions(+), 47 deletions(-)
---
diff --git a/mc.spec b/mc.spec
index eab48f1..ee91393 100644
--- a/mc.spec
+++ b/mc.spec
@@ -20,13 +20,13 @@ Summary(tr.UTF-8): Midnight Commander görsel kabuğu
Summary(uk.UTF-8): Диспетчер файлів Midnight Commander
Summary(zh_CN.UTF-8): 一个方便实用的文件管理器和虚拟Shell
Name: mc
-Version: 4.8.10
+Version: 4.8.11
Release: 1
Epoch: 1
License: GPL v3+
Group: Applications/Shells
Source0: http://ftp.midnight-commander.org/%{name}-%{version}.tar.xz
-# Source0-md5: 3d9c3777bb5c6e656792c1ef30f483b4
+# Source0-md5: 1a2d74b75ddbff0b0d6cdc04bf4a7d31
Source3:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source3-md5: 17d7b574e1b85ad6f8ddceda9e841f19
Source7: %{name}.desktop
diff --git a/mc-rpmfs.patch b/mc-rpmfs.patch
index 3eaf77a..6acb3a8 100644
--- a/mc-rpmfs.patch
+++ b/mc-rpmfs.patch
@@ -1,11 +1,8 @@
--- mc-4.8.2/src/vfs/extfs/helpers/rpm.orig 2011-11-27 15:11:03.000000000
+0100
+++ mc-4.8.2/src/vfs/extfs/helpers/rpm 2012-04-04 18:22:09.406582171 +0200
-@@ -164,12 +164,19 @@
- mcrpmfs_printOneMetaInfo "INFO/DESCRIPTION" "DESCRIPTION"
- mcrpmfs_printOneMetaInfo "INFO/SUMMARY" "SUMMARY"
+@@ -172,11 +172,17 @@
-- if test "`mcrpmfs_getRawOneTag
\"%{RPMTAG_PREIN}%{RPMTAG_POSTIN}%{RPMTAG_PREUN}%{RPMTAG_POSTUN}%{VERIFYSCRIPT}\"`"
!= "(none)(none)(none)(none)(none)"; then
-+ if test "`mcrpmfs_getRawOneTag
\"%{RPMTAG_PREINPROG}%{RPMTAG_POSTINPROG}%{RPMTAG_PREUNPROG}%{RPMTAG_POSTUNPROG}%{VERIFYSCRIPTPROG}%{TRIGGERSCRIPTPROG}\"`"
!= "(none)(none)(none)(none)(none)(none)"; then
+ if test "`mcrpmfs_getRawOneTag
\"%{RPMTAG_PREIN}%{RPMTAG_POSTIN}%{RPMTAG_PREUN}%{RPMTAG_POSTUN}%{VERIFYSCRIPT}%{TRIGGERSCRIPTS}\"`"
!= "(none)(none)(none)(none)(none)(none)"; then
mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/PREIN" "RPMTAG_PREIN" "raw"
+ mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/PREINPROG" "RPMTAG_PREINPROG"
"raw"
mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/POSTIN" "RPMTAG_POSTIN" "raw"
@@ -16,47 +13,9 @@
+ mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/POSTUNPROG" "RPMTAG_POSTUNPROG"
"raw"
mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/VERIFYSCRIPT" "VERIFYSCRIPT"
"raw"
+ mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/VERIFYSCRIPTPROG"
"VERIFYSCRIPTPROG" "raw"
-+ mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/TRIGGERSCRIPTS" "TRIGGERSCRIPTS"
"raw"
+ mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/TRIGGERSCRIPTS" "TRIGGERSCRIPTS"
"raw"
+ mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/TRIGGERSCRIPTPROG"
"TRIGGERSCRIPTPROG" "raw"
echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL"
fi
-@@ -215,6 +222,9 @@
-
- echo "dr-xr-xr-x 3 root root 0 $DATE INFO"
- echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
-+ if [ "`mcrpmfs_getOneTag EPOCH`" != "(none)" ]; then
-+ echo "$FILEPREF 0 $DATE INFO/NAME-EPOCH:VERSION-RELEASE"
-+ fi
- echo "$FILEPREF 0 $DATE INFO/GROUP"
- echo "$FILEPREF 0 $DATE INFO/BUILDHOST"
- echo "$FILEPREF 0 $DATE INFO/SOURCERPM"
-@@ -256,6 +266,10 @@
- echo `mcrpmfs_getOneTag "NAME"`-`mcrpmfs_getOneTag
"VERSION"`-`mcrpmfs_getOneTag "RELEASE"` > "$2"
- exit 0
- ;;
-+ INFO/NAME-EPOCH:VERSION-RELEASE)
-+ echo `mcrpmfs_getOneTag "NAME"`-`mcrpmfs_getOneTag
"EPOCH"`:`mcrpmfs_getOneTag "VERSION"`-`mcrpmfs_getOneTag "RELEASE"` > "$2"
-+ exit 0
-+ ;;
- INFO/RELEASE) mcrpmfs_getOneTag "RELEASE" > "$2"; exit 0;;
- INFO/GROUP) mcrpmfs_getRawOneTag "%{GROUP}\n" > "$2"; exit
0;;
- INFO/DISTRIBUTION) mcrpmfs_getOneTag "DISTRIBUTION" > "$2"; exit
0;;
-@@ -272,10 +286,17 @@
- INFO/REQUIRENAME) mcrpmfs_getRawOneTag "[%{REQUIRENAME}
%{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;;
- INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES}\n]" >"$2";
exit 0;;
- INFO/SCRIPTS/PREIN) mcrpmfs_getRawOneTag "%{RPMTAG_PREIN}\n" >"$2";
exit 0;;
-+ INFO/SCRIPTS/PREINPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PREINPROG}\n"
>"$2"; exit 0;;
- INFO/SCRIPTS/POSTIN) mcrpmfs_getRawOneTag "%{RPMTAG_POSTIN}\n"
>"$2"; exit 0;;
-+ INFO/SCRIPTS/POSTINPROG) mcrpmfs_getRawOneTag
"%{RPMTAG_POSTINPROG}\n" >"$2"; exit 0;;
- INFO/SCRIPTS/PREUN) mcrpmfs_getRawOneTag "%{RPMTAG_PREUN}\n" >"$2";
exit 0;;
-+ INFO/SCRIPTS/PREUNPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PREUNPROG}\n"
>"$2"; exit 0;;
- INFO/SCRIPTS/POSTUN) mcrpmfs_getRawOneTag "%{RPMTAG_POSTUN}\n"
>"$2"; exit 0;;
-+ INFO/SCRIPTS/POSTUNPROG) mcrpmfs_getRawOneTag
"%{RPMTAG_POSTUNPROG}\n" >"$2"; exit 0;;
- INFO/SCRIPTS/VERIFYSCRIPT) mcrpmfs_getRawOneTag
"%{VERIFYSCRIPT}\n" > "$2"; exit 0;;
-+ INFO/SCRIPTS/VERIFYSCRIPTPROG) mcrpmfs_getRawOneTag
"%{VERIFYSCRIPTPROG}\n" > "$2"; exit 0;;
-+ INFO/SCRIPTS/TRIGGERSCRIPTS) mcrpmfs_getRawOneTag
"%{TRIGGERSCRIPTS}\n" > "$2"; exit 0;;
-+ INFO/SCRIPTS/TRIGGERSCRIPTPROG) mcrpmfs_getRawOneTag
"%{TRIGGERSCRIPTPROG}\n" > "$2"; exit 0;;
- INFO/SCRIPTS/ALL) $RPM -qp --scripts "${rpm_filename}" >
"$2"; exit 0;;
- INFO/SUMMARY) mcrpmfs_getRawOneTag "%{SUMMARY}\n" > "$2";
exit 0;;
- INFO/OS) mcrpmfs_getRawOneTag "%{OS}\n" > "$2"; exit 0;;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mc.git/commitdiff/bb56503b575ed5efa1575a817e8a642e4ec79c3c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
