get_pkgname_from_filename: add support for full path to filename

e434fd9a · Vitaly Lipatov · 9c945af0 · e434fd9a
Commit e434fd9a authored May 20, 2012 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

rpm share/eterbuild/functions/rpm +3 -1

No files found.
--- a/share/eterbuild/functions/rpm
+++ b/share/eterbuild/functions/rpm
@@ -106,9 +106,11 @@ spec_by_srpm()
 }

 # pkg-source-1.0.src.rpm -> pkg-source
+# pkg-source_1.0.src.rpm -> pkg-source
 get_pkgname_from_filename()
 {
-	echo ${1/-[0-9]*/}
+	local FN=$(basename $1)
+	echo ${FN/[-_][0-9]*/}
 }

 # return source package name by binary rpm package file