rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f21'

Browse Source
This commit is contained in:
Tim Waugh 2014-10-22 09:06:14 +01:00
commit 299d5dde47
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.0.0 Version: 2.0.0
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -66,6 +66,7 @@ Patch36: cups-web-devices-timeout.patch
Patch37: cups-journal.patch Patch37: cups-journal.patch
Patch38: cups-synconclose.patch Patch38: cups-synconclose.patch
Patch39: cups-str4500.patch Patch39: cups-str4500.patch
Patch40: cups-str4496.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -265,6 +266,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
# Fix cupsGetPPD3() so it doesn't give the caller an unreadable file # Fix cupsGetPPD3() so it doesn't give the caller an unreadable file
# (bug #1150917, STR #4500). # (bug #1150917, STR #4500).
%patch39 -p1 -b .str4500 %patch39 -p1 -b .str4500
# Upstream fix for cupsd crash on restart when colord not available
# (STR #4496).
%patch40 -p1 -b .str4496
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -610,6 +614,10 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Wed Oct 22 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-8
- Upstream fix for cupsd crash on restart when colord not available
- (STR #4496).
* Sat Oct 18 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-7 * Sat Oct 18 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-7
- Fix for last fix (bug #1153660, bug #1154284). - Fix for last fix (bug #1153660, bug #1154284).