rebase to 2.2.6

This commit is contained in:
Zdenek Dohnal 2017-11-03 16:44:04 +01:00
parent b85c292042
commit ab1dfa50b3
5 changed files with 6 additions and 28 deletions

1
.gitignore vendored
View File

@ -84,3 +84,4 @@ cups-1.4.4-source.tar.bz2
/.metadata/
/cups-2.2.4-source.tar.gz
/cups-2.2.5-source.tar.gz
/cups-2.2.6-source.tar.gz

Binary file not shown.

View File

@ -1,23 +0,0 @@
diff -up cups-2.2.0/backend/org.cups.usb-quirks.libusb-quirks cups-2.2.0/backend/org.cups.usb-quirks
--- cups-2.2.0/backend/org.cups.usb-quirks.libusb-quirks 2016-09-14 01:39:47.000000000 +0200
+++ cups-2.2.0/backend/org.cups.usb-quirks 2016-11-07 18:46:32.913920903 +0100
@@ -76,6 +76,9 @@
# Canon, Inc. MP510 Printer (https://bugs.launchpad.net/bugs/1050009)
0x04a9 0x1717 unidir
+# Canon, Inc. MP540 Printer, https://bugzilla.redhat.com/967873
+0x04a9 0x1730 unidir
+
# Canon, Inc. MP550 Printer (Issue #4155)
0x04a9 0x173d unidir
@@ -127,6 +130,9 @@
# All Samsung devices (https://bugs.launchpad.net/bugs/1032456)
0x04e8 soft-reset
+# Samsung ML-2160 Series (https://bugzilla.redhat.com/show_bug.cgi?id=873123)
+0x04e8 0x330f unidir
+
# All Zebra devices (https://bugs.launchpad.net/bugs/1001028)
0x0a5f unidir

View File

@ -14,7 +14,7 @@
Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 2.2.5
Version: 2.2.6
Release: 1%{?dist}
License: GPLv2
Url: http://www.cups.org/
@ -55,7 +55,6 @@ Patch27: cups-avahi-address.patch
Patch29: cups-dymo-deviceid.patch
Patch30: cups-freebind.patch
#Patch31: cups-no-gcry.patch
Patch32: cups-libusb-quirks.patch
Patch33: cups-use-ipp1.1.patch
Patch34: cups-avahi-no-threaded.patch
Patch35: cups-ipp-multifile.patch
@ -241,8 +240,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch30 -p1 -b .freebind
# Don't link against libgcrypt needlessly.
#%%patch31 -p1 -b .no-gcry
# Added libusb quirk for Canon PIXMA MP540 (bug #967873).
%patch32 -p1 -b .libusb-quirks
# Default to IPP/1.1 for now (bug #977813).
%patch33 -p1 -b .use-ipp1.1
# Don't use D-Bus from two threads (bug #979748).
@ -624,6 +621,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
* Fri Nov 03 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-1
- rebase to 2.2.6
* Tue Oct 17 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.5-1
- rebase to 2.2.5

View File

@ -1 +1 @@
SHA512 (cups-2.2.5-source.tar.gz) = 5c824e74e2679de360ff1f95aa74013ca2d6a88d11d18041e7a5b51746c2a21bbc10da785791ea4e40d316167560982466789767018bd02676cf810ad0c3a5c9
SHA512 (cups-2.2.6-source.tar.gz) = 52aa26acf5d38de5a4867c70f5b3006cb84fe5b362876c2f907872107bbac3d95fb249389546745249ad24d032963ac2d70f98a0884427a974c5bc4edc199c45