[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/cups/FC-5 .cvsignore, 1.19, 1.20 cups-1.1.15-initscript.patch, 1.5, 1.6 cups.spec, 1.213, 1.214 sources, 1.21, 1.22 cups-str1880.patch, 1.1, NONE cups-str1881.patch, 1.3, NONE



Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9613

Modified Files:
	.cvsignore cups-1.1.15-initscript.patch cups.spec sources 
Removed Files:
	cups-str1880.patch cups-str1881.patch 
Log Message:
* Wed Aug 30 2006 Tim Waugh <twaugh redhat com> 1:1.2.3-1.1
- 1.2.3.  No longer need str1880 or str1881 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	20 Jul 2006 10:47:09 -0000	1.19
+++ .cvsignore	30 Aug 2006 14:57:36 -0000	1.20
@@ -10,3 +10,4 @@
 cups-1.2.0-source.tar.bz2
 cups-1.2.1-source.tar.bz2
 cups-1.2.2-source.tar.bz2
+cups-1.2.3-source.tar.bz2

cups-1.1.15-initscript.patch:
 Makefile |   30 ------------------------------
 1 files changed, 30 deletions(-)

Index: cups-1.1.15-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.15-initscript.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-1.1.15-initscript.patch	20 May 2006 16:39:29 -0000	1.5
+++ cups-1.1.15-initscript.patch	30 Aug 2006 14:57:36 -0000	1.6
@@ -1,6 +1,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 @@
+--- cups-1.2.3/Makefile.noinit	2006-08-29 16:51:19.000000000 +0100
++++ cups-1.2.3/Makefile	2006-08-30 15:53:20.000000000 +0100
+@@ -99,36 +99,6 @@
  	echo Installing cups-config script...
  	$(INSTALL_DIR) -m 755 $(BINDIR)
  	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
@@ -26,8 +26,9 @@
 -			$(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...; \
+-			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; \
 -		else \
 -			echo Installing RC script...; \
 -			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- cups.spec	25 Aug 2006 14:26:15 -0000	1.213
+++ cups.spec	30 Aug 2006 14:57:36 -0000	1.214
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.2
-Release: 1.9
+Version: 1.2.3
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -24,7 +24,6 @@
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
-Patch4: cups-str1881.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -34,7 +33,6 @@
 Patch11: cups-str1893.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
-Patch14: cups-str1880.patch
 Patch17: cups-serverbin-compat.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
@@ -122,7 +120,6 @@
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
-%patch4 -p1 -b .str1881
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -132,7 +129,6 @@
 %patch11 -p1 -b .str1893
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
-%patch14 -p1 -b .str1880
 %patch17 -p1 -b .serverbin-compat
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
@@ -415,6 +411,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug 30 2006 Tim Waugh <twaugh redhat com> 1:1.2.3-1.1
+- 1.2.3.  No longer need str1880 or str1881 patches.
+
 * Thu Aug 24 2006 Tim Waugh <twaugh redhat com> 1:1.2.2-1.9
 - Updated fix for STR #1881 from upstream.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	20 Jul 2006 10:47:09 -0000	1.21
+++ sources	30 Aug 2006 14:57:36 -0000	1.22
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-091de9109c9252cb37427859e90190ad  cups-1.2.2-source.tar.bz2
+7f65bae0054cd8335824942595d867ef  cups-1.2.3-source.tar.bz2


--- cups-str1880.patch DELETED ---


--- cups-str1881.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]