From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 15 Jul 2013 13:22:34 +0000 (+0000)
Subject: Update ipptool packaging script to allow for Fedora, Red Hat Enterprise Linux
X-Git-Tag: release-1.7.0~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0ccfab317a33c682ab6a4e7a23fccfb2dae9173;p=thirdparty%2Fcups.git

Update ipptool packaging script to allow for Fedora, Red Hat Enterprise Linux
(RHEL). and Ubuntu Linux variants since LSB doesn't support OpenSSL or Avahi.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11139 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/cups/dest.c b/cups/dest.c
index 36481f8082..41434e3975 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1427,6 +1427,7 @@ _cupsGetDests(http_t       *http,	/* I  - Connection to server or
   */
 
   appleGetPaperSize(media_default, sizeof(media_default));
+  fprintf(stderr, "Apple default media = %s\n", media_default);
 #endif /* __APPLE__ */
 
  /*
diff --git a/tools/makeipptoolpkg b/tools/makeipptoolpkg
index 1428257e46..331bdbf30a 100644
--- a/tools/makeipptoolpkg
+++ b/tools/makeipptoolpkg
@@ -23,11 +23,13 @@ if test ! -f tools/makeipptoolpkg; then
         exit 1
 fi
 
-uname="`uname | awk '{print tolower($1)}'`"
-if test "x$1" = xlsb; then
-	shift
-	uname="linux-lsb"
-fi
+platform="`uname | awk '{print tolower($1)}'`"
+case "x$1" in
+	xfedora* | xlsb | xrhel* | xubuntu*)
+		platform="linux-$1"
+		shift
+		;;
+esac
 
 if test $# = 0; then
 	echo Updating to get snapshot version...
@@ -74,13 +76,13 @@ cp test/print-job-gzip.test $pkgdir
 cp test/testfile.* $pkgdir
 cp test/validate-job.test $pkgdir
 
-if test `uname` = Darwin; then
-	pkgfile="$pkgdir-macosx-universal.dmg"
+if test x$platform = xdarwin; then
+	pkgfile="$pkgdir-osx-universal.dmg"
 	echo Creating disk image $pkgfile...
 	test -f $pkgfile && rm $pkgfile
 	hdiutil create -srcfolder $pkgdir $pkgfile
 else
-	pkgfile="$pkgdir-$uname-`uname -m`.tar.gz"
+	pkgfile="$pkgdir-$platform-`uname -m`.tar.gz"
 	echo Creating archive $pkgfile...
 	tar czf $pkgfile $pkgdir || exit 1
 fi
diff --git a/tools/makesrcdist b/tools/makesrcdist
index 1b6b6da7da..e98ee0579e 100755
--- a/tools/makesrcdist
+++ b/tools/makesrcdist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: makesrcdist 7776 2008-07-22 20:46:55Z mike $"
+# "$Id$"
 #
 # makesrcdist - make a source distribution of CUPS.
 #
@@ -129,5 +129,5 @@ rm -rf cups-$version
 echo "Done."
 
 #
-# End of "$Id: makesrcdist 7776 2008-07-22 20:46:55Z mike $".
+# End of "$Id$".
 #
diff --git a/tools/testrpm b/tools/testrpm
index 7d4e9e4a3c..74d1449e4a 100755
--- a/tools/testrpm
+++ b/tools/testrpm
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: testrpm 5304 2006-03-18 01:21:37Z mike $"
+# "$Id$"
 #
 # Test script for making RPMs...
 #
@@ -28,5 +28,5 @@ rm -f /usr/src/redhat/SRPMS/cups*.rpm
 rpmbuild -ta $args cups-$fileversion-source.tar.bz2
 
 #
-# End of "$Id: testrpm 5304 2006-03-18 01:21:37Z mike $".
+# End of "$Id$".
 #