Changeset 932 in MondoRescue for trunk/tools/pkg2fc

Timestamp:

Nov 15, 2006, 12:40:15 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r913:931 $SVN_M/branches/stable

File:

• trunk/tools/pkg2fc (modified) (3 diffs)

trunk/tools/pkg2fc

@@ -36 +36 @@
         c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi
@@ -51 +51 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
-    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
-    ppkg="$ppkg $pv-${TAG}${suf}.src.rpm"
+    tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"` 
+    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${tag}${suf}.src.rpm"
+    ppkg="$ppkg $pv-${tag}${suf}.src.rpm"
 done
 
@@ -62 +63 @@
     s=\`rpm -qlp \$p | egrep '\.spec'\`
     # Use dist for fc
-    perl -pi -e "s/define Release:[ \t]+[0-9]+..*/define Release:   $TAG%{?dist}/" rpm/SPECS/\$s
+    perl -pi -e "s/define Release:[ \t]+([0-9]+)..*/define Release: $1%{?dist}/" rpm/SPECS/\$s
     perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bruno@mondorescue.org> %{version}-%{release}/' rpm/SPECS/\$s
     rm -rf rpm/BUILD/*