From fcbc17be367cd5669084572e7ed41690ea979fdb Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 04:02:11 +0000
Subject: auto-import cups-1.1.17-0.2 from cups-1.1.17-0.2.src.rpm


---

diff --git a/.cvsignore b/.cvsignore
index 6d2c8d2..2242e89 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-cups-1.1.15-1-source.tar.bz2
+cups-1.1.17-source.tar.bz2
 postscript.ppd.gz
diff --git a/cups.init b/cups.init
index 28c467d..3462bc8 100644
--- a/cups.init
+++ b/cups.init
@@ -77,7 +77,7 @@ case $1 in
 		restart
 	;;
 	condrestart)
-		[ -f /var/lock/subsys/cups ] && restart
+		[ -f /var/lock/subsys/cups ] && restart || :
 	;;	
 	status)
 		status $DAEMON
diff --git a/cups.spec b/cups.spec
index cac75e5..91ae1cc 100644
--- a/cups.spec
+++ b/cups.spec
@@ -1,11 +1,11 @@
 %define initdir /etc/rc.d/init.d
-%define patchlevel 1
+%define patchlevel %{nil}
 %define use_alternatives 1
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.1.15
-Release: 10
+Version: 1.1.17
+Release: 0.2
 License: GPL
 Group: System Environment/Daemons
 %if "%{patchlevel}" != ""
@@ -23,6 +23,9 @@ Source7: pstoraster.convs
 Source8: postscript.ppd.gz
 Patch: cups-1.1.15-initscript.patch
 Patch1: cups-1.1.14-doclink.patch
+Patch2: cups-1.1.17-uninit.patch
+Patch3: cups-idefense-v2.patch
+Patch4: cups-1.1.17-pdftops.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -68,6 +71,9 @@ natively, without needing the lp/lpr commands.
 %setup -q
 %patch -p1 -b .noinit
 %patch1 -p1 -b .doclink
+%patch2 -p1 -b .uninit
+%patch3 -p0 -b .security
+%patch4 -p1 -b .pdftops
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 autoconf
 
@@ -137,6 +143,10 @@ If your browser does not support redirection, please use
 EOF
 done
 
+# Remove unshipped files.
+rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? \
+	$RPM_BUILD_ROOT%{_mandir}/fr
+                                                                                
 # Ship pstoraster (bug #69573).
 install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
@@ -240,6 +250,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cups
 
 %changelog
+* Wed Jan  8 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.2
+- Fix 'condrestart' behaviour in init script.
+
+* Fri Dec 13 2002 Tim Waugh <twaugh@redhat.com> 1.1.17-0.1
+- 1.1.17.
+- Fix cupsd startup hang (bug #79346).
+- Don't install files not shipped.
+- Security fixes.
+
 * Fri Aug 30 2002 Bernhard Rosenkraenzer <bero@redhat.de> 1.1.15-10
 - Add generic postscript PPD file (#73061)
 
diff --git a/sources b/sources
index 8961607..d0fdc26 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-971a14d35f61ea19871616f437e199a2  cups-1.1.15-1-source.tar.bz2
+22a8b951fc962e37d1c6ddab3b9b634a  cups-1.1.17-source.tar.bz2
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz