rpms/cups/devel .cvsignore, 1.18, 1.19 cups.spec, 1.183, 1.184 sources, 1.20, 1.21 cups-svn.patch, 1.5, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	24 Apr 2006 16:49:05 -0000	1.18
+++ .cvsignore	8 May 2006 21:55:43 -0000	1.19
@@ -9,3 +9,4 @@
 cups-1.2rc1-source.tar.bz2
 cups-1.2rc2-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/devel/cups.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- cups.spec	5 May 2006 16:46:59 -0000	1.183
+++ cups.spec	8 May 2006 21:55:44 -0000	1.184
@@ -1,15 +1,14 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
-%define beta rc3
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2
-Release: 0.5.%{beta}.4
+Version: 1.2.0
+Release: 2
 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
@@ -21,7 +20,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
@@ -101,8 +99,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
@@ -371,6 +368,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon May  8 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-2
+- 1.2.0.
+
 * Fri May  5 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.4
 - Sync to svn5493.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Apr 2006 17:05:16 -0000	1.20
+++ sources	8 May 2006 21:55:44 -0000	1.21
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-730b77b994d1be29e5bf1f884424e9ae  cups-1.2rc3-source.tar.bz2
+a168b0b1c8bb946060e659e1df2927c5  cups-1.2.0-source.tar.bz2


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