From 6c2dc40f199e422dc0613bff45d657fb7bd71260 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mar 04 2008 13:09:10 +0000
Subject: Don't need this patch.


---

diff --git a/cups-1.1.15-initscript.patch b/cups-1.1.15-initscript.patch
deleted file mode 100644
index 489d9cb..0000000
--- a/cups-1.1.15-initscript.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- cups-1.2.11/Makefile.noinit	2007-05-07 20:10:54.000000000 +0100
-+++ cups-1.2.11/Makefile	2007-06-13 16:44:37.000000000 +0100
-@@ -100,48 +100,6 @@
- 	echo Installing cups-config script...
- 	$(INSTALL_DIR) -m 755 $(BINDIR)
- 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
--	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; \
--		for level in $(RCLEVELS); do \
--			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
--			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
--			if test `uname` = HP-UX; then \
--				level=`expr $$level - 1`; \
--				$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
--			fi; \
--			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
--		done; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
--		$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
--	fi
--	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) $(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 files...; \
--			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
--			$(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
--			case `uname -r` in \
--				8.*) \
--				$(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
--				$(INSTALL_SCRIPT) init/PrintingServices.launchd $(BUILDROOT)/System/Library/StartupItems/PrintingServices/PrintingServices; \
--				$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)/System/Library/StartupItems/PrintingServices/StartupParameters.plist; \
--				$(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj; \
--				$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj/Localizable.strings; \
--				;; \
--			esac \
--		else \
--			echo Installing RC script...; \
--			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
--		fi \
--	fi
- 	if test "x$(DBUSDIR)" != x; then \
- 		echo Installing cups.conf in $(DBUSDIR)...;\
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
diff --git a/cups-locale.patch b/cups-locale.patch
deleted file mode 100644
index 63cf2b7..0000000
--- a/cups-locale.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- cups-1.2svn-r5137/cups/language.c.locale	2006-02-15 20:11:10.000000000 +0000
-+++ cups-1.2svn-r5137/cups/language.c	2006-02-23 14:43:59.000000000 +0000
-@@ -276,6 +276,7 @@
- #endif /* CODESET */
- 			*ptr,		/* Pointer into language/charset */
- 			real[48],	/* Real language name */
-+			ll_cc[48],	/* Language + Country name */
- 			filename[1024];	/* Filename for language locale file */
-   cups_encoding_t	encoding;	/* Encoding to use */
-   cups_lang_t		*lang;		/* Current language... */
-@@ -445,8 +446,10 @@
-   country[0] = '\0';
- 
-   if (language == NULL || !language[0] ||
--      !strcmp(language, "POSIX"))
-+      !strcmp(language, "POSIX")) {
-     strcpy(langname, "C");
-+    strcpy(ll_cc, langname);
-+  }
-   else
-   {
-    /*
-@@ -476,6 +479,7 @@
-       *ptr = '\0';
-     }
- 
-+    snprintf(ll_cc, sizeof(ll_cc), "%s_%s", langname, country);
-     if (*language == '.' && !charset[0])
-     {
-      /*
-@@ -617,7 +621,7 @@
-   */
- 
-   lang->used ++;
--  strlcpy(lang->language, real, sizeof(lang->language));
-+  strlcpy(lang->language, ll_cc, sizeof(lang->language));
- 
-   if (encoding != CUPS_AUTO_ENCODING)
-     lang->encoding = encoding;
diff --git a/cups.spec b/cups.spec
index 6b9425f..6ca0655 100644
--- a/cups.spec
+++ b/cups.spec
@@ -31,7 +31,6 @@ Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
 Patch8: cups-serverbin-compat.patch
-Patch9: cups-locale.patch
 Patch10: cups-no-export-ssllibs.patch
 Patch11: cups-paps.patch
 Patch12: cups-wbuffer.patch
@@ -146,7 +145,6 @@ lpd emulation.
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch8 -p1 -b .serverbin-compat
-%patch9 -p1 -b .locale
 %patch10 -p1 -b .no-export-ssllibs
 %patch11 -p1 -b .paps
 %patch12 -p1 -b .wbuffer