diff options
| author | Michael Sweet <michael.r.sweet@gmail.com> | 2017-01-17 12:38:01 -0500 |
|---|---|---|
| committer | Michael Sweet <michael.r.sweet@gmail.com> | 2017-01-17 12:38:01 -0500 |
| commit | 2b7e87a33c4346b07fa380d2c46ed4138e6ecd2c (patch) | |
| tree | dc8cba5215581f55d860485b742a824ed847f150 /tools | |
| parent | feb7c00ab51b0db3f263ee66edb1a5d10c925a82 (diff) | |
| download | cups-2b7e87a33c4346b07fa380d2c46ed4138e6ecd2c.tar.gz | |
Fix scripts and RPM spec file.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/makesrcdist | 6 | ||||
| -rwxr-xr-x | tools/testrpm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/makesrcdist b/tools/makesrcdist index 2d806d6c1..e684fe89e 100755 --- a/tools/makesrcdist +++ b/tools/makesrcdist @@ -15,7 +15,7 @@ if test ! -f tools/makesrcdist; then fi # See if we have local changes (other than this script...) -if (git status | grep -v makesrcdist | grep -q modified:); then +if (git status | grep -v makesrcdist | grep -v testrpm | grep -q modified:); then echo Local changes remain: git status | grep -v makesrcdist | grep modified: exit 1 @@ -27,14 +27,14 @@ if test $# = 0; then rev=`git show --oneline | head -1 | awk '{print $1}'` version="2.2git" fileversion="2.2git-$rev" - fileurl="file://$TMPDIR/cups-$fileversion.tar.gz" + fileurl="file://$TMPDIR/cups-${fileversion}-source.tar.gz" SIGNFILES=no else # Use version from command-line rev="1" version=$1 fileversion=$1 - fileurl="https://github.com/apple/cups/releases/download/release-$fileversion/cups-$fileversion-source.tar.gz" + fileurl="https://github.com/apple/cups/releases/download/v$fileversion/cups-${fileversion}-source.tar.gz" SIGNFILES=yes echo Validating sources... diff --git a/tools/testrpm b/tools/testrpm index b933a6538..3b700b2c8 100755 --- a/tools/testrpm +++ b/tools/testrpm @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -x # # Test script for making RPMs... # @@ -23,4 +23,4 @@ shift $# echo Building rpm... #rm -f /usr/src/redhat/RPMS/i386/cups*.rpm #rm -f /usr/src/redhat/SRPMS/cups*.rpm -rpmbuild -ta $args cups-$fileversion-source.tar.gz +rpmbuild -ta $args cups-${fileversion}-source.tar.gz |