rpms/cups/FC-5 .cvsignore, 1.16, 1.17 cups.spec, 1.167, 1.168 sources, 1.18, 1.19 cups-link.patch, 1.3, NONE cups-svn.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-link.patch cups-svn.patch 
Log Message:
* Mon May  8 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-1.1
- 1.2.0.
- No longer need link patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	24 Apr 2006 16:53:41 -0000	1.16
+++ .cvsignore	8 May 2006 21:59:51 -0000	1.17
@@ -7,3 +7,4 @@
 cups-1.1.23rc1-source.tar.bz2
 cups-1.1.23-source.tar.bz2
 cups-1.2rc3-source.tar.bz2
+cups-1.2.0-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- cups.spec	26 Apr 2006 17:18:05 -0000	1.167
+++ cups.spec	8 May 2006 21:59:51 -0000	1.168
@@ -1,16 +1,15 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define build_as_pie 1
-%define beta rc3
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2
-Release: 0.4.1.%{beta}.1
+Version: 1.2.0
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
+Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
 Source5: cups-lpd
@@ -22,7 +21,6 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -43,7 +41,6 @@
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
-Patch40: cups-link.patch
 Patch41: cups-relro.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -115,8 +112,7 @@
 lpd emulation.
 
 %prep
-%setup -q -n %{name}-%{version}%{beta}
-%patch0 -p0 -b .svn
+%setup -q -n %{name}-%{version}
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -139,7 +135,6 @@
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
-%patch40 -p1 -b .link
 %patch41 -p1 -b .relro
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
@@ -394,6 +389,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon May  8 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-1.1
+- 1.2.0.
+- No longer need link patch.
+
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
 - Own /var/run/cups (bug #189561).
 - Patch pdftops to understand 'includeifexists', and use that in the


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	24 Apr 2006 16:53:41 -0000	1.18
+++ sources	8 May 2006 21:59:51 -0000	1.19
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-730b77b994d1be29e5bf1f884424e9ae  cups-1.2rc3-source.tar.bz2
+a168b0b1c8bb946060e659e1df2927c5  cups-1.2.0-source.tar.bz2


--- cups-link.patch DELETED ---


--- cups-svn.patch DELETED ---