From 40ac45ca0005cb22fcbc56b87d4d856fb4f479ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 9 Jul 2012 14:25:30 +0000 Subject: [PATCH] ETICS-less package release polishing: - initial source packages unsigned (==> gpg key not required in first stage) - not limit age version only to numbers - remove bashism in .src.rpm generator script --- org.glite.lb/configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index dea02d5..9d5b276 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -1215,7 +1215,7 @@ sub get_version while () { chomp; ($major,$minor,$rev) = ($1,$2,$3) if /module\.version\s*=\s*([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/; - $age = $1 if /module\.age\s*=\s*([[:digit:]]+)/; + $age = $1 if /module\.age\s*=\s*(\S+)/; } close V; $_ = $old_; @@ -1394,7 +1394,7 @@ distcheck: ${package}-${version}.tar.gz rpm: ${package}-${version}.tar.gz dir=dist/rpm_build_src; \ rm -rf $$dir; \ - mkdir -p $$dir/{BUILD,RPMS,SOURCES,SRPMS}; \ + mkdir -p $$dir/BUILD $$dir/RPMS $$dir/SOURCES $$dir/SRPMS; \ cp ${package}-${version}.tar.gz $$dir/SOURCES/${package}-${version}-${module.age}.src.tar.gz && \ rpmbuild -bs --nodeps --define "_topdir $$dir" ${package}.spec && \ cp -v $$dir/SRPMS/*.src.rpm dist/ @@ -1406,7 +1406,7 @@ deb: ${package}-${version}.tar.gz cp ${package}-${version}.tar.gz $$dir/${package}_${version}.orig.tar.gz && \ tar zxf $$dir/${package}_${version}.orig.tar.gz -C $$dir && \ cp -rf debian/ $$dir/${package}-${version} && \ - (cd $$dir/${package}-${version} && dpkg-buildpackage -S -d -nc) && \ + (cd $$dir/${package}-${version} && dpkg-buildpackage -S -d -nc -us -uc) && \ cp -v $$dir/*.tar.gz $$dir/*.dsc dist/ '; -- 1.8.2.3