Author: baggins Date: Thu Mar 29 16:01:43 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- removed obsolete COPYRIGHT tag
- switched obsolete SERIAL tag to EPOCH
---- Files affected:
SOURCES:
mc-rpmfs.patch (1.17 -> 1.18)
---- Diffs:
================================================================
Index: SOURCES/mc-rpmfs.patch
diff -u SOURCES/mc-rpmfs.patch:1.17 SOURCES/mc-rpmfs.patch:1.18
--- SOURCES/mc-rpmfs.patch:1.17 Wed Mar 28 18:56:28 2007
+++ SOURCES/mc-rpmfs.patch Thu Mar 29 18:01:38 2007
@@ -1,14 +1,15 @@
---- ./vfs/extfs/rpm.rpmfs 2005-06-10 16:35:52.596825344 +0200
-+++ ./vfs/extfs/rpm 2005-06-10 16:49:22.707669776 +0200
+diff -ur mc-2007-03-09-18.orig/vfs/extfs/rpm mc-2007-03-09-18/vfs/extfs/rpm
+--- mc-2007-03-09-18.orig/vfs/extfs/rpm 2006-11-01 18:31:20.000000000
+0100
++++ mc-2007-03-09-18/vfs/extfs/rpm 2007-03-29 17:59:32.000000000 +0200
@@ -50,7 +50,11 @@
echo "-r-xr-xr-x 1 root root 39 $DATE INSTALL"
echo "-r-xr-xr-x 1 root root 39 $DATE UPGRADE"
echo "dr-xr-xr-x 3 root root 0 $DATE INFO"
- echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
-+ if [ "`$RPM -qp --qf \"%{SERIAL}\" \"$1\"`" = "(none)" ]; then
++ if [ "`$RPM -qp --qf \"%{EPOCH}\" \"$1\"`" = "(none)" ]; then
+ echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
+ else
-+ echo "$FILEPREF 0 $DATE INFO/NAME-SERIAL:VERSION-RELEASE"
++ echo "$FILEPREF 0 $DATE INFO/NAME-EPOCH:VERSION-RELEASE"
+ fi
echo "$FILEPREF 0 $DATE INFO/GROUP"
echo "$FILEPREF 0 $DATE INFO/BUILDHOST"
@@ -65,15 +66,43 @@
echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL"
fi
if test "$MCFASTRPM" = 0 ; then
-@@ -140,6 +168,7 @@
+@@ -95,10 +120,6 @@
+ echo "$FILEPREF 0 $DATE INFO/PACKAGER"
+ test "`$RPM -qp --qf \"%{URL}\" \"$f\"`" = "(none)" ||
+ echo "$FILEPREF 0 $DATE INFO/URL"
+- test "`$RPM -qp --qf \"%{SERIAL}\" \"$f\"`" = "(none)" ||
+- echo "$FILEPREF 0 $DATE INFO/SERIAL"
+- test "`$RPM -qp --qf \"%{COPYRIGHT}\" \"$f\"`" = "(none)" ||
+- echo "$FILEPREF 0 $DATE INFO/COPYRIGHT"
+ test "`$RPM -qp --qf \"%{EPOCH}\" \"$f\"`" = "(none)" ||
+ echo "$FILEPREF 0 $DATE INFO/EPOCH"
+ test "`$RPM -qp --qf \"%{LICENSE}\" \"$f\"`" = "(none)" ||
+@@ -106,8 +127,6 @@
+ else
+ echo "$FILEPREF 0 $DATE INFO/PACKAGER"
+ echo "$FILEPREF 0 $DATE INFO/URL"
+- echo "$FILEPREF 0 $DATE INFO/SERIAL"
+- echo "$FILEPREF 0 $DATE INFO/COPYRIGHT"
+ echo "$FILEPREF 0 $DATE INFO/EPOCH"
+ echo "$FILEPREF 0 $DATE INFO/LICENSE"
+ fi
+@@ -146,6 +165,7 @@
UPGRADE) echo "# Run this to upgrade this RPM package" > "$3"; exit 0;;
ERROR) $RPM -qip "$f" > /dev/null 2> "$3"; exit 0;;
INFO/NAME-VERSION-RELEASE) $RPM -qp --qf
"%{NAME}-%{VERSION}-%{RELEASE}\n" "$f" > "$3"; exit 0;;
-+ INFO/NAME-SERIAL:VERSION-RELEASE) $RPM -qp --qf
"%{NAME}-%{SERIAL}:%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
++ INFO/NAME-EPOCH:VERSION-RELEASE) $RPM -qp --qf
"%{NAME}-%{EPOCH}:%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
INFO/RELEASE) $RPM -qp --qf "%{RELEASE}\n" "$f" > "$3"; exit
0;;
INFO/GROUP) $RPM -qp --qf "%{GROUP}\n" "$f" > "$3"; exit 0;;
INFO/DISTRIBUTION) $RPM -qp --qf "%{DISTRIBUTION}\n" "$f" > "$3";
exit 0;;
-@@ -155,10 +184,17 @@
+@@ -156,18 +176,23 @@
+ INFO/PACKAGER) $RPM -qp --qf "%{PACKAGER}\n" "$f" > "$3"; exit
0;;
+ INFO/URL) $RPM -qp --qf "%{URL}\n" "$f" >"$3"; exit 0;;
+ INFO/BUILDTIME) $RPM -qp --qf "%{BUILDTIME:date}\n" "$f" >"$3";
exit 0;;
+- INFO/SERIAL) $RPM -qp --qf "%{SERIAL}\n" "$f" >"$3"; exit 0;;
+- INFO/COPYRIGHT) $RPM -qp --qf "%{COPYRIGHT}\n" "$f" >"$3"; exit
0;;
+ INFO/EPOCH) $RPM -qp --qf "%{EPOCH}\n" "$f" >"$3"; exit 0;;
+ INFO/LICENSE) $RPM -qp --qf "%{LICENSE}\n" "$f" >"$3"; exit
0;;
+ INFO/RPMVERSION) $RPM -qp --qf "%{RPMVERSION}\n" "$f" >"$3";
exit 0;;
INFO/REQUIRENAME) $RPM -qp --qf "[%{REQUIRENAME}
%{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$f" >"$3"; exit 0;;
INFO/PROVIDES) $RPM -qp --qf "[%{PROVIDES}\n]" "$f" >"$3";
exit 0;;
INFO/SCRIPTS/PREIN) $RPM -qp --qf "%{RPMTAG_PREIN}\n" "$f" >"$3";
exit 0;;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mc-rpmfs.patch?r1=1.17&r2=1.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
