rpms/cups/FC-5 cups-banners.patch,NONE,1.1 cups.spec,1.155,1.156
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 19 15:20:56 UTC 2006
- Previous message (by thread): rpms/cups/devel cups-banners.patch,NONE,1.1 cups.spec,1.164,1.165
- Next message (by thread): rpms/firefox/devel .cvsignore, 1.23, 1.24 firefox.spec, 1.116, 1.117 sources, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22920
Modified Files:
cups.spec
Added Files:
cups-banners.patch
Log Message:
* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
- Ignore .rpmnew and .rpmsave banner files.
cups-banners.patch:
banners.c | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE cups-banners.patch ---
--- cups-1.2rc2/scheduler/banners.c.banners 2006-04-19 16:12:07.000000000 +0100
+++ cups-1.2rc2/scheduler/banners.c 2006-04-19 16:12:42.000000000 +0100
@@ -119,6 +119,8 @@
if ((ext = strrchr(dent->filename, '.')) != NULL)
if (!strcmp(ext, ".bck") ||
!strcmp(ext, ".bak") ||
+ !strcmp(ext, ".rpmnew") ||
+ !strcmp(ext, ".rpmsave") ||
!strcmp(ext, ".sav"))
continue;
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- cups.spec 11 Apr 2006 17:09:20 -0000 1.155
+++ cups.spec 19 Apr 2006 15:20:53 -0000 1.156
@@ -28,6 +28,7 @@
Patch4: cups-1.1.17-backend.patch
Patch5: cups-ext.patch
Patch6: cups-kde.patch
+Patch7: cups-banners.patch
Patch8: cups-logfileperm.patch
Patch9: cups-1.1.17-rcp.patch
Patch10: cups-1.1.17-ppdsdat.patch
@@ -120,6 +121,7 @@
%patch4 -p1 -b .backend
%patch5 -p1 -b .ext
%patch6 -p1 -b .kde
+%patch7 -p1 -b .banners
%patch8 -p1 -b .logfileperm
%patch9 -p1 -b .rcp
%patch10 -p1 -b .ppdsdat
@@ -379,6 +381,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
+- Ignore .rpmnew and .rpmsave banner files.
+
* Tue Apr 11 2006 Tim Waugh <twaugh at redhat.com>
- Ship a /etc/cups/pdftops.conf file (bug #188583).
- Previous message (by thread): rpms/cups/devel cups-banners.patch,NONE,1.1 cups.spec,1.164,1.165
- Next message (by thread): rpms/firefox/devel .cvsignore, 1.23, 1.24 firefox.spec, 1.116, 1.117 sources, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list