rpms/mc/devel mc-rpmconf.patch, NONE, 1.1 mc.spec, 1.108, 1.109 sources, 1.35, 1.36

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21736

Modified Files:
	mc.spec sources 
Added Files:
	mc-rpmconf.patch 
Log Message:
- display also conflicts in addition to provides/obsoletes/requires while browsing RPM vfs


mc-rpmconf.patch:
 rpm |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE mc-rpmconf.patch ---
--- mc-2006-10-15-16/vfs/extfs/rpm.rpmconf	2006-08-02 17:56:45.000000000 +0200
+++ mc-2006-10-15-16/vfs/extfs/rpm	2006-10-31 09:37:00.000000000 +0100
@@ -122,12 +122,15 @@
 	echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
     $RPM -qp --qf "[%{PROVIDES}\n]" "$f" | grep "(none)" > /dev/null ||
 	echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+    $RPM -qp --qf "[%{CONFLICTS}\n]" "$f" | grep "(none)" > /dev/null ||
+	echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
     test "`$RPM -qp --qf \"%{CHANGELOGTEXT}\" \"$f\"`" = "(none)" ||
        echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
     else 
 	echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
 	echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
 	echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+	echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
         echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
     fi
 
@@ -171,6 +174,7 @@
 	INFO/CHANGELOG)		$RPM -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$f" > "$3"; exit 0;;
 	INFO/SIZE)		$RPM -qp --qf "%{SIZE} bytes\n" "$f" > "$3"; exit 0;;
 	INFO/OBSOLETES)		$RPM -qp --qf "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" "$f" > "$3"; exit 0;;
+	INFO/CONFLICTS)		$RPM -qp --qf "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" "$f" >"$3"; exit 0;;
 	CONTENTS.cpio)		$RPM2CPIO "$1" > "$3"; exit 0;;
 	*)
 	    ;;


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mc.spec	27 Oct 2006 13:19:40 -0000	1.108
+++ mc.spec	31 Oct 2006 14:04:54 -0000	1.109
@@ -3,7 +3,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.1a
-Release:	32%{?dist}
+Release:	33%{?dist}
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -28,6 +28,7 @@
 Patch13:	mc-fishfix.patch
 Patch14:	mc-utf8-8bit-hex.patch
 Patch15:	mc-ipv6.patch
+Patch16:	mc-rpmconf.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -54,6 +55,7 @@
 %patch13 -p1 -b .fishfix
 %patch14 -p1 -b .8bit-hex
 %patch15 -p1 -b .ipv6
+%patch16 -p1 -b .rpmconf
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -198,6 +200,10 @@
 %dir %{_sysconfdir}/mc
 
 %changelog
+* Tue Oct 31 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-33
+- display also conflicts in addition to provides/obsoletes/requires
+  while browsing RPM vfs
+
 * Fri Oct 27 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-32
 - update to new CVS snapshot
 - fix IPv6 FISH support


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	27 Oct 2006 13:19:40 -0000	1.35
+++ sources	31 Oct 2006 14:04:54 -0000	1.36
@@ -1,2 +1 @@
-166770dd758526b2a013a6978a8bb54a  mc-2006-09-25-14.tar.gz
 4057fa1eca69fea254a92c9d1a4496f6  mc-2006-10-15-16.tar.gz