|
|
@@ -7,7 +7,7 @@
|
|
|
|
|
|
Summary: Common Unix Printing System
|
|
|
Name: cups
|
|
|
-Version: 1.7.1
|
|
|
+Version: 1.7.3
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: System Environment/Daemons
|
|
|
@@ -78,21 +78,19 @@ Patch24: cups-ricoh-deviceid-oid.patch
|
|
|
Patch25: cups-systemd-socket.patch
|
|
|
Patch26: cups-lpd-manpage.patch
|
|
|
Patch27: cups-avahi-address.patch
|
|
|
-Patch29: cups-enum-all.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-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
|
|
|
+Patch28: cups-enum-all.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
|
|
|
+Patch36: cups-web-devices-timeout.patch
|
|
|
+Patch37: cups-final-content-type.patch
|
|
|
+Patch38: cups-journal.patch
|
|
|
+Patch39: cups-synconclose.patch
|
|
|
+
|
|
|
Patch101: cups-1.4.6-pstext-utf8.patch
|
|
|
Patch102: cups-serverbin-compat2.patch
|
|
|
Patch103: cups-serverbin-compat3.patch
|
|
|
@@ -134,6 +132,7 @@ Requires: avahi >= 0.6.20
|
|
|
Requires: avahi-tools
|
|
|
Requires: dbus >= 0.90
|
|
|
Requires: poppler-utils
|
|
|
+Requires: cups-filters
|
|
|
|
|
|
%package devel
|
|
|
Summary: Common Unix Printing System - development environment
|
|
|
@@ -247,7 +246,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.
|
|
|
@@ -264,40 +263,37 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
|
|
|
%patch24 -p1 -b .ricoh-deviceid-oid
|
|
|
# Add support for systemd socket activation (patch from Lennart
|
|
|
# Poettering).
|
|
|
-%patch25 -p1 -b .systemd-socket
|
|
|
+##%patch25 -p1 -b .systemd-socket
|
|
|
# Talk about systemd in cups-lpd manpage (part of bug #884641).
|
|
|
%patch26 -p1 -b .lpd-manpage
|
|
|
# Use IP address when resolving DNSSD URIs (bug #948288).
|
|
|
%patch27 -p1 -b .avahi-address
|
|
|
# Return from cupsEnumDests() once all records have been returned.
|
|
|
-%patch29 -p1 -b .enum-all
|
|
|
+%patch28 -p1 -b .enum-all
|
|
|
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
|
|
|
-%patch31 -p1 -b .dymo-deviceid
|
|
|
+%patch29 -p1 -b .dymo-deviceid
|
|
|
# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
|
|
|
-%patch32 -p1 -b .freebind
|
|
|
+%patch30 -p1 -b .freebind
|
|
|
# Don't link against libgcrypt needlessly.
|
|
|
-%patch33 -p1 -b .no-gcry
|
|
|
+%patch31 -p1 -b .no-gcry
|
|
|
# Added libusb quirk for Canon PIXMA MP540 (bug #967873).
|
|
|
-%patch34 -p1 -b .libusb-quirks
|
|
|
+%patch32 -p1 -b .libusb-quirks
|
|
|
# Default to IPP/1.1 for now (bug #977813).
|
|
|
-%patch35 -p1 -b .use-ipp1.1
|
|
|
+%patch33 -p1 -b .use-ipp1.1
|
|
|
# Don't use D-Bus from two threads (bug #979748).
|
|
|
-%patch36 -p1 -b .avahi-no-threaded
|
|
|
+%patch34 -p1 -b .avahi-no-threaded
|
|
|
# Fixes for jobs with multiple files and multiple formats.
|
|
|
-%patch37 -p1 -b .ipp-multifile
|
|
|
-# Full relro (bug #996740).
|
|
|
-%patch38 -p1 -b .full-relro
|
|
|
+%patch35 -p1 -b .ipp-multifile
|
|
|
# Increase web interface get-devices timeout to 10s (bug #996664).
|
|
|
-%patch39 -p1 -b .web-devices-timeout
|
|
|
+%patch36 -p1 -b .web-devices-timeout
|
|
|
# Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
|
|
|
# printing to remote CUPS servers (bug #1010580).
|
|
|
-%patch40 -p1 -b .final-content-type
|
|
|
+%patch37 -p1 -b .final-content-type
|
|
|
# Allow "journal" log type for log output to system journal.
|
|
|
-%patch41 -p1 -b .journal
|
|
|
+#%patch38 -p1 -b .journal
|
|
|
# Set the default for SyncOnClose to Yes.
|
|
|
-%patch42 -p1 -b .synconclose
|
|
|
+%patch39 -p1 -b .synconclose
|
|
|
|
|
|
-%patch100 -p1 -b .template-ja
|
|
|
#%patch101 -p1 -b .pstext
|
|
|
%patch102 -p0 -b .serverbin-compat2
|
|
|
%patch103 -p0 -b .serverbin-compat3
|
|
|
@@ -349,7 +345,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
|
|
|
perl -pi -e "s,^DSO =.*,DSO=gcc -fpic," Makedefs
|
|
|
|
|
|
# If we got this far, all prerequisite libraries must be here.
|
|
|
-make %{?_smp_mflags} OPTIM="$RPM_OPT_FLAGS -fpic"
|
|
|
+make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
@@ -667,6 +663,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jun 8 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.3-1
|
|
|
+- new upstream release.
|
|
|
+- removed Patch100 (fixed in upstream).
|
|
|
+
|
|
|
* Tue Feb 11 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.1-1
|
|
|
- new upstream release.
|
|
|
|
tomop