From a75a05a74662697ac1f60e59797fbec1b965719f Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mar 16 2007 10:51:31 +0000
Subject: - 1.2.9.


---

diff --git a/.cvsignore b/.cvsignore
index bd9b728..cdcfb9b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -18,3 +18,4 @@ cups-1.2.5-source.tar.bz2
 cups-1.2.6-source.tar.bz2
 cups-1.2.7-source.tar.bz2
 cups-1.2.8-source.tar.bz2
+cups-1.2.9-source.tar.bz2
diff --git a/cups-1.1.15-initscript.patch b/cups-1.1.15-initscript.patch
index 33faea7..516b944 100644
--- a/cups-1.1.15-initscript.patch
+++ b/cups-1.1.15-initscript.patch
@@ -1,6 +1,6 @@
---- cups-1.2.3/Makefile.noinit	2006-08-29 16:51:19.000000000 +0100
-+++ cups-1.2.3/Makefile	2006-08-30 15:46:36.000000000 +0100
-@@ -99,36 +99,6 @@
+--- cups-1.2.9/Makefile.noinit	2007-03-12 20:49:13.000000000 +0000
++++ cups-1.2.9/Makefile	2007-03-16 10:43:41.000000000 +0000
+@@ -99,39 +99,6 @@
  	echo Installing cups-config script...
  	$(INSTALL_DIR) -m 755 $(BINDIR)
  	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
@@ -8,14 +8,17 @@
 -		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; \
--		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
--		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
--		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
--		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+-		$(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); \
diff --git a/cups.spec b/cups.spec
index f5bec91..2a5d8f1 100644
--- a/cups.spec
+++ b/cups.spec
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.8
-Release: 5%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -43,7 +43,6 @@ Patch18: cups-directed-broadcast.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
-Patch22: cups-options.patch
 Patch23: cups-scm_credentials.patch
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -150,7 +149,6 @@ lpd emulation.
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
-%patch22 -p1 -b .options
 %patch23 -p1 -b .scm_credentials
 
 %if %lspp
@@ -437,6 +435,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Mar 16 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.9-1
+- 1.2.9.
+
 * Fri Mar  9 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.8-5
 - Better UNIX domain sockets authentication patch after feedback from
   Uli (bug #230613).
diff --git a/sources b/sources
index 191e6c4..577197b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-d2cc0604113d5300b7b3e823b660d04a  cups-1.2.8-source.tar.bz2
+73433d7e8c04b66702732928aaf087b8  cups-1.2.9-source.tar.bz2