Author: glen Date: Thu Sep 29 18:05:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - --specfile could return subpackages too, take just main package
---- Files affected: SPECS: pearize.sh (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/pearize.sh diff -u SPECS/pearize.sh:1.9 SPECS/pearize.sh:1.10 --- SPECS/pearize.sh:1.9 Thu Sep 29 02:02:24 2005 +++ SPECS/pearize.sh Thu Sep 29 20:05:11 2005 @@ -4,8 +4,8 @@ # set -e spec="$1" -tarball=$(rpm -q --qf '../SOURCES/%{name}-%{version}.tgz' --specfile "$spec" | sed -e 's,php-pear-,,') -template=$(rpm -q --qf '%{name}-%{version}.spec' --specfile "$spec") +tarball=(rpm -q --qf '../SOURCES/%{name}-%{version}.tgz\n' --specfile "$spec" | head -n 1 | sed -e 's,php-pear-,,') +template=$(rpm -q --qf '%{name}-%{version}.spec\n' --specfile "$spec" | head -n 1) if [ ! -f $tarball ]; then ./builder -g $spec @@ -22,7 +22,7 @@ # http://info.ccone.at/INFO/Mail-Archives/procmail/Jul-2004/msg00132.html sed -i -e '/./,$ !d;/^$/N;/\n$/D' $template -rpm=$(rpm -q --qf '../RPMS/%{name}-%{version}-%{release}.noarch.rpm' --specfile "$spec") +rpm=$(rpm -q --qf '../RPMS/%{name}-%{version}-%{release}.noarch.rpm\n' --specfile "$spec" | head -n 1) if [ ! -f $rpm ]; then rpmbuild -bb $spec fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pearize.sh?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit