rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Ignore .rpmnew and .rpmsave banner files.

Browse Source
This commit is contained in:
Tim Waugh 2006-04-19 15:15:06 +00:00
parent 14b92054aa
commit 62dfe30efd
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cups-banners.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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;

5
cups.spec
View File

@ -28,6 +28,7 @@ Patch3: cups-1.1.16-system-auth.patch
Patch4: cups-1.1.17-backend.patch Patch4: cups-1.1.17-backend.patch
Patch5: cups-ext.patch Patch5: cups-ext.patch
Patch6: cups-kde.patch Patch6: cups-kde.patch
Patch7: cups-banners.patch
Patch8: cups-logfileperm.patch Patch8: cups-logfileperm.patch
Patch9: cups-1.1.17-rcp.patch Patch9: cups-1.1.17-rcp.patch
Patch10: cups-1.1.17-ppdsdat.patch Patch10: cups-1.1.17-ppdsdat.patch
@ -115,6 +116,7 @@ lpd emulation.
%patch4 -p1 -b .backend %patch4 -p1 -b .backend
%patch5 -p1 -b .ext %patch5 -p1 -b .ext
%patch6 -p1 -b .kde %patch6 -p1 -b .kde
%patch7 -p1 -b .banners
%patch8 -p1 -b .logfileperm %patch8 -p1 -b .logfileperm
%patch9 -p1 -b .rcp %patch9 -p1 -b .rcp
%patch10 -p1 -b .ppdsdat %patch10 -p1 -b .ppdsdat
@ -374,6 +376,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Wed Apr 19 2006 Tim Waugh <twaugh@redhat.com>
- Ignore .rpmnew and .rpmsave banner files.
* Tue Apr 11 2006 Tim Waugh <twaugh@redhat.com> * Tue Apr 11 2006 Tim Waugh <twaugh@redhat.com>
- Ship a /etc/cups/pdftops.conf file (bug #188583). - Ship a /etc/cups/pdftops.conf file (bug #188583).