From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 14 Jun 2016 17:42:19 +0000 (-0400)
Subject: Fix typos.
X-Git-Tag: v2.2b1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42e378159840f7b42ea107f74455440eaec64dc0;p=thirdparty%2Fcups.git

Fix typos.
---

diff --git a/tools/makesrcdist b/tools/makesrcdist
index 597699501a..60c4a1dbcf 100755
--- 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 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."