From 579b4523fa2522ee862955501b4eced4425200e2 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Sat, 20 May 2006 16:35:12 +0000
Subject: [PATCH] - Sync to svn5555. No longer need str1670 or str1705 patches.

---
 cups-1.1.15-initscript.patch | 11 +++++++----
 cups.spec                    |  7 +++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cups-1.1.15-initscript.patch b/cups-1.1.15-initscript.patch
index c6b1fb8..fae819f 100644
--- a/cups-1.1.15-initscript.patch
+++ b/cups-1.1.15-initscript.patch
@@ -1,11 +1,11 @@
---- cups-1.2b2/Makefile.noinit	2006-03-23 11:39:33.000000000 +0000
-+++ cups-1.2b2/Makefile	2006-03-23 11:40:22.000000000 +0000
-@@ -80,32 +80,6 @@
+--- cups-1.2.0/Makefile.noinit	2006-05-20 17:21:22.000000000 +0100
++++ cups-1.2.0/Makefile	2006-05-20 17:27:01.000000000 +0100
+@@ -99,35 +99,6 @@
  	echo Installing cups-config script...
  	$(INSTALL_DIR) -m 755 $(BINDIR)
  	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
--	echo Installing startup script...
 -	if test "x$(INITDIR)" != x; then \
+-		echo Installing init scripts...; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
 -		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
@@ -20,13 +20,16 @@
 -	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
 -		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
 -		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+-			echo Installing StartupItems files...; \
 -			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
 -			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
 -			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 -			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
 -		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+-			echo Installing LaunchDaemons configuration file...; \
 -			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
 -		else \
+-			echo Installing RC script...; \
 -			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 -		fi \
 -	fi
diff --git a/cups.spec b/cups.spec
index 6332734..72d99b1 100644
--- a/cups.spec
+++ b/cups.spec
@@ -35,8 +35,6 @@ Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch32: cups-pid.patch
 Patch41: cups-relro.patch
-Patch42: cups-str1670.patch
-Patch43: cups-str1705.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -122,8 +120,6 @@ lpd emulation.
 %patch24 -p1 -b .maxlogsize
 %patch32 -p1 -b .pid
 %patch41 -p1 -b .relro
-%patch42 -p1 -b .str1670
-%patch43 -p1 -b .str1705
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -379,6 +375,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sat May 20 2006 Tim Waugh <twaugh@redhat.com>
+- Sync to svn5555.  No longer need str1670 or str1705 patches.
+
 * Fri May 19 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.0-5
 - Sync to svn5545.
 - Ship a driver directory.