rpms/cups/devel .cvsignore, 1.38, 1.39 cups.spec, 1.391, 1.392 sources, 1.41, 1.42 cups-1.3.x.patch, 1.2, NONE

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28666

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-1.3.x.patch 
Log Message:
* Wed Feb 20 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.6-1
- 1.3.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	18 Dec 2007 17:36:16 -0000	1.38
+++ .cvsignore	20 Feb 2008 10:00:28 -0000	1.39
@@ -30,3 +30,4 @@
 cups-1.3.3-source.tar.bz2
 cups-1.3.4-source.tar.bz2
 cups-1.3.5-source.tar.bz2
+cups-1.3.6-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- cups.spec	14 Feb 2008 14:08:32 -0000	1.391
+++ cups.spec	20 Feb 2008 10:00:28 -0000	1.392
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.5
-Release: 6%{?dist}
+Version: 1.3.6
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -24,7 +24,6 @@
 Source13: pdftops.conf
 Source14: textonly.filter
 Source15: textonly.ppd
-Patch0: cups-1.3.x.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -139,7 +138,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .1.3.x
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -185,7 +183,7 @@
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
-	--with-dbusdir=%{_sysconfig}/dbus-1/system.d \
+	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
@@ -457,6 +455,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Feb 20 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.6-1
+- 1.3.6.
+
 * Thu Feb 14 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.5-6
 - Include fixes from svn up to revision 7304.  No longer need str2703 patch.
   Build with --with-dbusdir.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	18 Dec 2007 17:36:16 -0000	1.41
+++ sources	20 Feb 2008 10:00:28 -0000	1.42
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-355705c528e9a8d0d439da15454d79a6  cups-1.3.5-source.tar.bz2
+642f9f6d879999bff1b51aeee57a3ce1  cups-1.3.6-source.tar.bz2


--- cups-1.3.x.patch DELETED ---