|
@@ -7,7 +7,7 @@
|
|
|
|
|
|
Summary: Common Unix Printing System
|
|
|
Name: cups
|
|
|
-Version: 1.7.0
|
|
|
+Version: 1.7.1
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: System Environment/Daemons
|
|
@@ -55,7 +55,6 @@ Source208: cups.conf
|
|
|
Patch1: cups-no-gzip-man.patch
|
|
|
Patch2: cups-system-auth.patch
|
|
|
Patch3: cups-multilib.patch
|
|
|
-Patch4: cups-dbus-utf8.patch
|
|
|
Patch5: cups-banners.patch
|
|
|
Patch6: cups-serverbin-compat.patch
|
|
|
Patch7: cups-no-export-ssllibs.patch
|
|
@@ -79,24 +78,19 @@ Patch24: cups-ricoh-deviceid-oid.patch
|
|
|
Patch25: cups-systemd-socket.patch
|
|
|
Patch26: cups-lpd-manpage.patch
|
|
|
Patch27: cups-avahi-address.patch
|
|
|
-Patch28: cups-usb-timeout.patch
|
|
|
Patch29: cups-enum-all.patch
|
|
|
-Patch30: cups-stringpool-rdar15382819.patch
|
|
|
Patch31: cups-dymo-deviceid.patch
|
|
|
Patch32: cups-freebind.patch
|
|
|
Patch33: cups-no-gcry.patch
|
|
|
Patch34: cups-libusb-quirks.patch
|
|
|
Patch35: cups-use-ipp1.1.patch
|
|
|
Patch36: cups-avahi-no-threaded.patch
|
|
|
-Patch37: cups-gz-crc.patch
|
|
|
-Patch39: cups-ipp-multifile.patch
|
|
|
-Patch40: cups-full-relro.patch
|
|
|
-Patch41: cups-web-devices-timeout.patch
|
|
|
-Patch43: cups-final-content-type.patch
|
|
|
-Patch44: cups-jobhistory.patch
|
|
|
-Patch45: cups-journal.patch
|
|
|
-Patch46: cups-synconclose.patch
|
|
|
-Patch47: cups-dbus-notifier.patch
|
|
|
+Patch37: cups-ipp-multifile.patch
|
|
|
+Patch38: cups-full-relro.patch
|
|
|
+Patch39: cups-web-devices-timeout.patch
|
|
|
+Patch40: cups-final-content-type.patch
|
|
|
+Patch41: cups-journal.patch
|
|
|
+Patch42: cups-synconclose.patch
|
|
|
|
|
|
Patch100: cups-1.7.0-fix-ja-template.patch
|
|
|
Patch101: cups-1.4.6-pstext-utf8.patch
|
|
@@ -145,8 +139,8 @@ Requires: poppler-utils
|
|
|
Summary: Common Unix Printing System - development environment
|
|
|
Group: Development/Libraries
|
|
|
Requires: %{name}-libs = %{version}-%{release}
|
|
|
-Requires: openssl-devel
|
|
|
Requires: krb5-devel
|
|
|
+Requires: openssl-devel
|
|
|
Requires: zlib-devel
|
|
|
License: LGPL
|
|
|
|
|
@@ -164,8 +158,8 @@ Summary: Common Unix Printing System - development environment
|
|
|
Group: Development/Libraries
|
|
|
Requires: compat32-%{name}-libs = %{version}-%{release}
|
|
|
Requires: %{name}-devel = %{version}-%{release}
|
|
|
-Requires: compat32-gnutls-devel
|
|
|
Requires: compat32-krb5-devel
|
|
|
+Requires: compat32-openssl-devel
|
|
|
Requires: compat32-zlib-devel
|
|
|
|
|
|
%description
|
|
@@ -228,8 +222,6 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
|
|
|
%patch2 -p1 -b .system-auth
|
|
|
# Prevent multilib conflict in cups-config script.
|
|
|
%patch3 -p1 -b .multilib
|
|
|
-# Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
|
|
|
-%patch4 -p1 -b .dbus-utf8
|
|
|
# Ignore rpm save/new files in the banners directory.
|
|
|
%patch5 -p1 -b .banners
|
|
|
# Use compatibility fallback path for ServerBin.
|
|
@@ -255,7 +247,7 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
|
|
|
# Support for errno==ENOSPACE-based USB paper-out reporting.
|
|
|
%patch16 -p1 -b .usb-paperout
|
|
|
# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
|
|
|
-%patch17 -p1 -b .res_init
|
|
|
+#%patch17 -p1 -b .res_init
|
|
|
# Log extra debugging information if no filters are available.
|
|
|
%patch18 -p1 -b .filter-debug
|
|
|
# Allow the usb backend to understand old-style URI formats.
|
|
@@ -277,12 +269,8 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
|
|
|
%patch26 -p1 -b .lpd-manpage
|
|
|
# Use IP address when resolving DNSSD URIs (bug #948288).
|
|
|
%patch27 -p1 -b .avahi-address
|
|
|
-# Prevent USB timeouts causing incorrect print output (bug #1026914).
|
|
|
-%patch28 -p1 -b .usb-timeout
|
|
|
# Return from cupsEnumDests() once all records have been returned.
|
|
|
%patch29 -p1 -b .enum-all
|
|
|
-# Prevent stringpool damage leading to memory leaks (bug #974048).
|
|
|
-%patch30 -p1 -b .stringpool-rdar15382819
|
|
|
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
|
|
|
%patch31 -p1 -b .dymo-deviceid
|
|
|
# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
|
|
@@ -295,25 +283,19 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
|
|
|
%patch35 -p1 -b .use-ipp1.1
|
|
|
# Don't use D-Bus from two threads (bug #979748).
|
|
|
%patch36 -p1 -b .avahi-no-threaded
|
|
|
-# Avoid sign-extending CRCs for gz decompression (bug #983486).
|
|
|
-%patch37 -p1 -b .gz-crc
|
|
|
# Fixes for jobs with multiple files and multiple formats.
|
|
|
-%patch39 -p1 -b .ipp-multifile
|
|
|
+%patch37 -p1 -b .ipp-multifile
|
|
|
# Full relro (bug #996740).
|
|
|
-%patch40 -p1 -b .full-relro
|
|
|
+%patch38 -p1 -b .full-relro
|
|
|
# Increase web interface get-devices timeout to 10s (bug #996664).
|
|
|
-%patch41 -p1 -b .web-devices-timeout
|
|
|
+%patch39 -p1 -b .web-devices-timeout
|
|
|
# Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
|
|
|
# printing to remote CUPS servers (bug #1010580).
|
|
|
-%patch43 -p1 -b .final-content-type
|
|
|
-# Fix job history logging.
|
|
|
-%patch44 -p1 -b .jobhistory
|
|
|
+%patch40 -p1 -b .final-content-type
|
|
|
# Allow "journal" log type for log output to system journal.
|
|
|
-%patch45 -p1 -b .journal
|
|
|
+%patch41 -p1 -b .journal
|
|
|
# Set the default for SyncOnClose to Yes.
|
|
|
-%patch46 -p1 -b .synconclose
|
|
|
-# Avoid stale lockfile in dbus notifier (bug #1026949).
|
|
|
-%patch47 -p1 -b .dbus-notifier
|
|
|
+%patch42 -p1 -b .synconclose
|
|
|
|
|
|
%patch100 -p1 -b .template-ja
|
|
|
#%patch101 -p1 -b .pstext
|
|
@@ -685,6 +667,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Feb 11 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.1-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Sat Jan 04 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.0-1
|
|
|
- new upstream release.
|
|
|
|