Fix RPM packaging issues.

Update source tarball script.

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index dcac1adcb8c70db4260aa3914f00efcf88527a69..6465ca1c19e8dc67914908903f19690920246a92 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -274,8 +274,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/cups/*.*
 %dir /usr/share/doc/cups/help
 /usr/share/doc/cups/help/accounting.html
+/usr/share/doc/cups/help/admin.html
 /usr/share/doc/cups/help/cgi.html
 /usr/share/doc/cups/help/encryption.html
+/usr/share/doc/cups/help/firewalls.html
 /usr/share/doc/cups/help/glossary.html
 /usr/share/doc/cups/help/kerberos.html
 /usr/share/doc/cups/help/license.html

diff --git a/tools/makesrcdist b/tools/makesrcdist
index 7ce1e589d7b8da35b12490eb580453faa406ff0c..e9966a6e92d3ba5863d382acd33c0fa553df2b25 100755 (executable)
--- a/tools/makesrcdist
+++ b/tools/makesrcdist
@@ -25,8 +25,8 @@ fi
 if test $# = 0; then
        # Compute version for snapshot
        rev=`git show --oneline | head -1 | awk '{print $1}'`
-       version="2.2git"
-       fileversion="2.2git-$rev"
+       version="2.3git"
+       fileversion="2.3git-$rev"
        fileurl="file://$TMPDIR/cups-${fileversion}-source.tar.gz"
        SIGNFILES=no
 else
@@ -39,7 +39,7 @@ else
 
        echo Validating sources...
        cupsversionpatch=`echo $version | awk -F. '{if (NF == 3) { print $3 } else { print "0" } }'`
-       cupsversion=`printf "2.02%02d" $cupsversionpatch`
+       cupsversion=`printf "2.03%02d" $cupsversionpatch`
 
         temp=`grep AC_INIT configure.ac | awk '{print $2}' | sed -e '1,$s/^\[//' -e '1,$s/\],$//'`
         if test "$temp" != $version; then