Sophie

Sophie

distrib > Mandriva > 2010.0 > x86_64 > media > main-testing-src > by-pkgid > c436e0743ca5d32f105637cdebeac083 > files > 24

mc-4.7.0.1-1mdv2010.0.src.rpm

diff -Naurp mc/lib/mc.ext.in mc.oden/lib/mc.ext.in
--- mc/lib/mc.ext.in	2008-12-23 17:21:17.000000000 +0100
+++ mc.oden/lib/mc.ext.in	2008-12-23 17:21:37.000000000 +0100
@@ -197,7 +197,11 @@ regex/\.trpm$
 	View=%view{ascii} rpm -qivl --scripts `basename %p .trpm`
 
 # RPM packages (SuSE uses *.spm for source packages)
-regex/\.(rpm|spm)$
+regex/\.(src\.rpm|spm)$
+	Open=%cd %p#srpm
+	View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
+
+regex/\.rpm$
 	Open=%cd %p#rpm
 	View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
 
diff -Naurp mc/vfs/extfs/Makefile.am mc.oden/vfs/extfs/Makefile.am
--- mc/vfs/extfs/Makefile.am	2005-07-20 21:03:54.000000000 +0200
+++ mc.oden/vfs/extfs/Makefile.am	2008-12-23 17:21:37.000000000 +0100
@@ -4,7 +4,7 @@ extfsdir = $(pkgdatadir)/extfs
 EXTFS_MISC  = README extfs.ini sfs.ini
 
 # Scripts hat don't need adaptation to the local system
-EXTFS_CONST = bpp rpm trpm u7z
+EXTFS_CONST = bpp rpm trpm srpm u7z
 
 # Scripts that need adaptation to the local system - source files
 EXTFS_IN    = 			\
diff -Naurp mc/vfs/extfs/extfs.ini mc.oden/vfs/extfs/extfs.ini
--- mc/vfs/extfs/extfs.ini	2005-07-20 21:03:54.000000000 +0200
+++ mc.oden/vfs/extfs/extfs.ini	2008-12-23 17:21:37.000000000 +0100
@@ -17,6 +17,7 @@ uar
 
 # Packages from popular Linux distributions
 rpm
+srpm
 deb
 
 # a: - mtools filesystem
diff -Naurp mc/vfs/extfs/srpm mc.oden/vfs/extfs/srpm
--- mc/vfs/extfs/srpm	2008-12-23 17:21:17.000000000 +0100
+++ mc.oden/vfs/extfs/srpm	2008-12-23 17:21:37.000000000 +0100
@@ -19,8 +19,15 @@ unset LC_ALL
 LC_TIME=C
 export LC_TIME
 
+if rpmbuild --version >/dev/null 2>&1; then
+	RPMBUILD="rpmbuild"
+else
+	RPMBUILD="rpm"
+fi
+
 if rpm --nosignature --version >/dev/null 2>&1; then
   RPM="rpm --nosignature"
+  RPMBUILD="$RPMBUILD --nosignature"
 else
   RPM="rpm"
 fi
@@ -48,7 +55,7 @@ mcrpmfs_list ()
     HEADERSIZE=`echo "$DESC" | wc -c`
     echo "-r--r--r--   1 root     root  $HEADERSIZE $DATE HEADER"
     echo "-r-xr-xr-x   1 root     root    39 $DATE INSTALL"
-    echo "-r-xr-xr-x   1 root     root    39 $DATE UPGRADE"
+    echo "-r-xr-xr-x   1 root     root    39 $DATE REBUILD"
     echo "dr-xr-xr-x   3 root     root	   0 $DATE INFO"
     echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
     echo "$FILEPREF 0 $DATE INFO/GROUP"
@@ -137,7 +144,7 @@ mcrpmfs_copyout ()
     case "$2" in
 	HEADER) $RPM -qip "$f" > "$3"; exit 0;;
 	INSTALL) echo "# Run this to install this RPM package" > "$3"; exit 0;;
-	UPGRADE) echo "# Run this to upgrade this RPM package" > "$3"; exit 0;;
+	REBUILD) echo "# Run this to rebuild 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/RELEASE)		$RPM -qp --qf "%{RELEASE}\n" "$f" > "$3"; exit 0;;
@@ -178,7 +185,7 @@ mcrpmfs_run ()
     f="`echo "$1" | $SED "$SEDCMD"`"
     case "$2" in
 	INSTALL) echo "Installing \"\"$f\"\""; $RPM -ivh "$f"; exit 0;;
-	UPGRADE) echo "Upgrading \"\"$f\"\""; $RPM -Uvh "$f"; exit 0;;
+	REBUILD) echo "Rebuilding \"$1\""; $RPMBUILD --rebuild "$1"; exit 0;;
     esac
 }