rpms/cups/devel .cvsignore, 1.15, 1.16 cups.spec, 1.140, 1.141 sources, 1.16, 1.17 cups-1.2svn5335.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-1.2svn5335.patch 
Log Message:
* Mon Mar 27 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.0
- 1.2rc1.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Jan 2005 12:24:50 -0000	1.15
+++ .cvsignore	27 Mar 2006 10:20:44 -0000	1.16
@@ -6,3 +6,4 @@
 cups-1.1.22-source.tar.bz2
 cups-1.1.23rc1-source.tar.bz2
 cups-1.1.23-source.tar.bz2
+cups-1.2rc1-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- cups.spec	24 Mar 2006 15:53:11 -0000	1.140
+++ cups.spec	27 Mar 2006 10:20:44 -0000	1.141
@@ -1,13 +1,13 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define build_as_pie 1
-%define beta b2
+%define beta rc1
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.1.%{beta}.6
+Release: 0.2.%{beta}.0
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -21,7 +21,6 @@
 Source10: ncp.backend
 Source11: cups.conf
 Source12: cups.cron
-Patch0: cups-1.2svn5335.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -108,7 +107,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
-%patch0 -p1 -b .svn5335
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -229,6 +227,7 @@
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 
 
 %post
@@ -371,6 +370,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Mar 27 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.0
+- 1.2rc1.
+
 * Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b2.6
 - Add KDE compatibility symbols _ipp_add_attr/_ipp_free_attr to ipp.h, with
   a comment saying why they shouldn't be used.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Mar 2006 12:10:57 -0000	1.16
+++ sources	27 Mar 2006 10:20:44 -0000	1.17
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-67a912af67de02e290a149f3947da96d  cups-1.2b2-source.tar.bz2
+e1cebe3393c360eb7972efa0715befa1  cups-1.2rc1-source.tar.bz2


--- cups-1.2svn5335.patch DELETED ---