]> git.pld-linux.org Git - packages/rpm-build-tools.git/commitdiff
- --specfile could return subpackages too, take just main package
authorElan Ruusamäe <glen@pld-linux.org>
Thu, 29 Sep 2005 18:05:11 +0000 (18:05 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    pearize.sh -> 1.10

pearize.sh

index 69b709948e498541bec8d2922e86410c662fde5a..3ba957ecbff99f8daac268d65680792d2df49861 100644 (file)
@@ -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
This page took 0.043294 seconds and 4 git commands to generate.