Fix scripts and RPM spec file.

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 7f4e3adf8f079ef23d908d9a2e8fc2a527c810aa..45c40ed1c802b3b0df95187adae7cdd5df1d5228 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -297,7 +297,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/locale/ja
 /usr/share/locale/ja/cups_ja.po
 %dir /usr/share/locale/pt_BR
-/usr/share/locale/ru/cups_pt_BR.po
+/usr/share/locale/pt_BR/cups_pt_BR.po
 %dir /usr/share/locale/ru
 /usr/share/locale/ru/cups_ru.po
 

diff --git a/tools/makesrcdist b/tools/makesrcdist
index 2d806d6c19814dddc8c6e1316473e7e3c1d6615b..e684fe89e4a42e3500a5086be97e7be1f2f6b769 100755 (executable)
--- 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 b933a65383daf089d213b35518e8b94a073b311d..3b700b2c8648630109ff5f97b8260eb296f38284 100755 (executable)
--- 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