Fix typos and remove more files from tarballs.

diff --git a/tools/makesrcdist b/tools/makesrcdist
index 5447ebcd446b08c71cd7a369b37c46471d929789..b6e6c868d97a87f9c41cafb729ecea930030f8b3 100755 (executable)
--- a/tools/makesrcdist
+++ b/tools/makesrcdist
@@ -84,21 +84,21 @@ fileurl=`echo $fileurl | sed -e '1,$s/\\//\\\\\\//g'`
 echo Exporting $fileversion...
 rm -rf $TMPDIR/cups-$version
 mkdir $TMPDIR/cups-$version
-git archive | (cd $TMPDIR/cups-$version; tar xf -)
+git archive --format tar HEAD | (cd $TMPDIR/cups-$version; tar xf -)
 
 echo Preparing files...
 cd $TMPDIR/cups-$version
 sed -e '1,$s/@CUPS_VERSION@/'$version'/' \
        -e '1,$s/^Source:.*/Source: '$fileurl'/' \
-       <cups-$version/packaging/cups.spec.in \
-       >cups-$version/packaging/cups.spec
-rm -rf tools
+       <packaging/cups.spec.in \
+       >packaging/cups.spec
+rm -rf everywhere tools .gitignore
 cd ..
 
 echo Archiving...
 tar czf cups-$fileversion-source.tar.gz cups-$version
 
 echo Removing temporary files...
-rm -rf cups-$version
+#rm -rf cups-$version
 
 echo "Done - files in $TMPDIR."