rel-eng/rpm2pkg/rpm2pkg | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 52a0e8db39fd2f01ecbf02f2d6f9e695079f5261
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 19 14:27:45 2010 +0200
remove dist tag from file name and from pkginfo
diff --git a/rel-eng/rpm2pkg/rpm2pkg b/rel-eng/rpm2pkg/rpm2pkg
index ca02a98..61c5d88 100755
--- a/rel-eng/rpm2pkg/rpm2pkg
+++ b/rel-eng/rpm2pkg/rpm2pkg
@@ -135,7 +135,10 @@ PKG_NAME=RHAT$2
if [ "$RPM_ARCH" == 'sparc64' ] ; then RPM_ARCH='sparce' ; fi
read RPM_SUMMARY
} < <( rpm -qp --nosignature --qf
'%{name}\n%{version}\n%{release}\n%{arch}\n%{summary}\n' $RPM_FILE )
-PKG_FILE=$( echo $RPM_FILE | sed -e 's!\.noarch\.rpm$!.rpm!' -e
"s!^.*\(-.*-.*\)\.rpm\$!$PKG_NAME\1.pkg!" )
+PKG_FILE=$( echo $RPM_FILE | sed -e 's!\.noarch\.rpm$!.rpm!' -e
"s!^.*\(-.*-[0-9]*\)[^-]*\.rpm\$!$PKG_NAME\1.pkg!" )
+
+# remove dist tag
+RPM_RELEASE=$( echo RPM_RELEASE | sed -e 's!^\([0-9]*\).*!\1!' )
STAMP=$( date '+%Y%m%d-%H%M%S' )
if [ -f $PKG_FILE ] ; then
Show replies by date