[cups/f20: 5/5] Merge branch 'f19' into f20
Tim Waugh
twaugh at fedoraproject.org
Fri Sep 27 16:43:20 UTC 2013
commit 1e8ec83658a743a211f4b8e80ef3231a8051bdd4
Merge: 08d18fe 77e3fed
Author: Tim Waugh <twaugh at redhat.com>
Date: Fri Sep 27 17:42:46 2013 +0100
Merge branch 'f19' into f20
cups-final-content-type.patch | 17 +++++++++++++++++
cups.spec | 16 +++++++++++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 2f16f7b,8d716c6..29017c1
--- a/cups.spec
+++ b/cups.spec
@@@ -13,8 -10,8 +13,8 @@@
Summary: CUPS printing system
Name: cups
Epoch: 1
-Version: 1.6.4
-Release: 2%{?dist}
+Version: 1.7
- Release: 0.25.%{prever}%{?dist}
++Release: 0.26.%{prever}%{?dist}
License: GPLv2
Group: System Environment/Daemons
Url: http://www.cups.org/
@@@ -61,16 -58,15 +61,18 @@@ Patch27: cups-avahi-address.patc
Patch29: cups-enum-all.patch
Patch30: cups-stringpool-setprinterattr.patch
Patch31: cups-dymo-deviceid.patch
-Patch32: cups-use-ipp1.1.patch
+Patch32: cups-freebind.patch
Patch33: cups-no-gcry.patch
-Patch34: cups-avahi-no-threaded.patch
-Patch35: cups-gz-crc.patch
-Patch36: cups-ipp-multifile.patch
-Patch37: cups-full-relro.patch
-Patch38: cups-web-devices-timeout.patch
-Patch39: cups-final-content-type.patch
+Patch34: cups-libusb-quirks.patch
+Patch35: cups-use-ipp1.1.patch
+Patch36: cups-avahi-no-threaded.patch
+Patch37: cups-gz-crc.patch
+Patch38: cups-build.patch
+Patch39: cups-ipp-multifile.patch
+Patch40: cups-full-relro.patch
+Patch41: cups-web-devices-timeout.patch
++Patch42: cups-synconclose.patch
++Patch43: cups-final-content-type.patch
Patch100: cups-lspp.patch
@@@ -245,26 -244,23 +247,31 @@@ Sends IPP requests to the specified UR
%patch30 -p1 -b .stringpool-setprinterattr
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
%patch31 -p1 -b .dymo-deviceid
-# Default to IPP/1.1 for now (bug #977813).
-%patch32 -p1 -b .use-ipp1.1
+# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
+%patch32 -p1 -b .freebind
# Don't link against libgcrypt needlessly.
%patch33 -p1 -b .no-gcry
+# Added libusb quirk for Canon PIXMA MP540 (bug #967873).
+%patch34 -p1 -b .libusb-quirks
+# Default to IPP/1.1 for now (bug #977813).
+%patch35 -p1 -b .use-ipp1.1
# Don't use D-Bus from two threads (bug #979748).
-%patch34 -p1 -b .avahi-no-threaded
+%patch36 -p1 -b .avahi-no-threaded
# Avoid sign-extending CRCs for gz decompression (bug #983486).
-%patch35 -p1 -b .gz-crc
+%patch37 -p1 -b .gz-crc
+# Fixed build.
+%patch38 -p1 -b .build
# Fixes for jobs with multiple files and multiple formats.
-%patch36 -p1 -b .ipp-multifile
+%patch39 -p1 -b .ipp-multifile
# Full relro (bug #996740).
-%patch37 -p1 -b .full-relro
+%patch40 -p1 -b .full-relro
# Increase web interface get-devices timeout to 10s (bug #996664).
-%patch38 -p1 -b .web-devices-timeout
+%patch41 -p1 -b .web-devices-timeout
++# Add SyncOnClose option (bug #984883).
++%patch42 -p0 -b .synconclose
+ # Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
+ # printing to remote CUPS servers (bug #1010580).
-%patch39 -p1 -b .final-content-type
++%patch43 -p1 -b .final-content-type
%if %lspp
# LSPP support.
@@@ -639,22 -649,29 +646,29 @@@ rm -f %{cups_serverbin}/backend/sm
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
-* Fri Sep 27 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.4-2
++* Fri Sep 27 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.26.rc1
+ - Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
+ printing to remote CUPS servers (bug #1010580).
+
-* Wed Sep 25 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.4-1
-- 1.6.4.
-
-* Wed Aug 21 2013 Jaromír Končický <jkoncick at redhat.com> - 1:1.6.3-8
++* Wed Aug 21 2013 Jaromír Končický <jkoncick at redhat.com>
+ - Add SyncOnClose option (bug #984883).
+
-* Fri Aug 16 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-7
+* Fri Aug 16 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.25.rc1
- Increase web interface get-devices timeout to 10s (bug #996664).
-* Thu Aug 15 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-6
+* Thu Aug 15 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.24.rc1
- Build with full read-only relocations (bug #996740).
-* Tue Aug 6 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-5
+* Tue Aug 6 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.23.rc1
- Fixes for jobs with multiple files and multiple formats.
-* Wed Jul 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-4
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.7-0.22.rc1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.21.rc1
- Fixed cups-config, broken by last change (bug #987660).
-* Mon Jul 22 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-3
+* Mon Jul 22 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.20.rc1
- Removed stale comment in spec file.
- Link against OpenSSL instead of GnuTLS.
More information about the scm-commits
mailing list