From: Elan Ruusamäe Date: Thu, 29 Sep 2005 18:05:11 +0000 (+0000) Subject: - --specfile could return subpackages too, take just main package X-Git-Tag: auto/th/rpm-build-tools-4.5-5~7^2~294 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=2bf93f1889b4d20e65076b23b5a24ef8988ddedd;p=packages%2Frpm-build-tools.git - --specfile could return subpackages too, take just main package Changed files: pearize.sh -> 1.10 --- diff --git a/pearize.sh b/pearize.sh index 69b7099..3ba957e 100644 --- a/pearize.sh +++ b/pearize.sh @@ -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 @@ sed -i -e '/^%if !1/,/%endif/d' $template # 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