[cups: 3/3] 1.5.0
Jiří Popelka
jpopelka at fedoraproject.org
Tue Jul 26 11:27:07 UTC 2011
commit 90cf1a0fdd9c82326ba0cd15523365dd5f20c18c
Merge: 8612dba dd41b5b
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Tue Jul 26 13:23:01 2011 +0200
1.5.0
.gitignore | 1 +
cups-str3875.patch | 15 ---------------
cups-str3880.patch | 34 ----------------------------------
cups.spec | 17 +++++++----------
sources | 2 +-
5 files changed, 9 insertions(+), 60 deletions(-)
---
diff --cc .gitignore
index 961e480,dc5dffb..89a99c8
--- a/.gitignore
+++ b/.gitignore
@@@ -45,6 -45,5 +45,7 @@@ cups-1.4.3-source.tar.bz
cups-1.4.4-source.tar.bz2
/cups-1.4.5-source.tar.bz2
/cups-1.4.6-source.tar.bz2
-/cups-1.4.7-source.tar.bz2
-/cups-1.4.8-source.tar.bz2
+/cups-1.5b1-source.tar.bz2
+/cups-1.5b2-source.tar.bz2
+/cups-1.5rc1-source.tar.bz2
++/cups-1.5.0-source.tar.bz2
diff --cc cups.spec
index 1d8e1c9,a3579fc..c841a26
--- a/cups.spec
+++ b/cups.spec
@@@ -10,17 -10,19 +10,15 @@@
# but we use lib for compatibility with 3rd party drivers (at upstream request).
%global cups_serverbin %{_exec_prefix}/lib/cups
- %global alphatag rc1
-
Summary: Common Unix Printing System
Name: cups
- Version: 1.5
- Release: 0.16.%{alphatag}%{?dist}
-Version: 1.4.8
++Version: 1.5.0
+ Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
- Source: http://ftp.easysw.com/pub/cups/%{version}%{alphatag}/cups-%{version}%{alphatag}-source.tar.bz2
+ Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
-# Our initscript
-Source1: cups.init
# Pixmap for desktop file
Source2: cupsprinter.png
-# udev rules for libusb devices
-Source3: cups-libusb.rules
# LSPP-required ps->pdf filter
Source4: pstopdf
# xinetd config file for cups-lpd service
@@@ -46,28 -48,38 +44,27 @@@ Patch8: cups-direct-usb.patc
Patch9: cups-lpr-help.patch
Patch10: cups-peercred.patch
Patch11: cups-pid.patch
-Patch12: cups-page-label.patch
-Patch13: cups-eggcups.patch
-Patch14: cups-getpass.patch
-Patch15: cups-driverd-timeout.patch
-Patch16: cups-strict-ppd-line-length.patch
-Patch17: cups-logrotate.patch
-Patch18: cups-usb-paperout.patch
-Patch19: cups-build.patch
-Patch20: cups-res_init.patch
-Patch21: cups-filter-debug.patch
-Patch22: cups-uri-compat.patch
-Patch23: cups-cups-get-classes.patch
-Patch24: cups-str3382.patch
-Patch25: cups-force-gnutls.patch
-Patch26: cups-serialize-gnutls.patch
-Patch27: cups-0755.patch
-Patch28: cups-snmp-quirks.patch
-Patch29: cups-hp-deviceid-oid.patch
-Patch30: cups-dnssd-deviceid.patch
-Patch31: cups-ricoh-deviceid-oid.patch
-Patch32: cups-texttops-rotate-page.patch
-Patch33: cups-usb-parallel.patch
-Patch34: cups-str3535.patch
-Patch35: cups-polld-busy-loop.patch
-
-Patch40: cups-avahi-1-config.patch
-Patch41: cups-avahi-2-backend.patch
-Patch42: cups-avahi-3-timeouts.patch
-Patch43: cups-avahi-4-poll.patch
-Patch44: cups-avahi-5-services.patch
-
-Patch45: cups-icc.patch
+Patch12: cups-eggcups.patch
+Patch13: cups-getpass.patch
+Patch14: cups-driverd-timeout.patch
+Patch15: cups-strict-ppd-line-length.patch
+Patch16: cups-logrotate.patch
+Patch17: cups-usb-paperout.patch
+Patch18: cups-build.patch
+Patch19: cups-res_init.patch
+Patch20: cups-filter-debug.patch
+Patch21: cups-uri-compat.patch
+Patch22: cups-cups-get-classes.patch
+Patch23: cups-str3382.patch
+Patch25: cups-0755.patch
+Patch26: cups-snmp-quirks.patch
+Patch27: cups-hp-deviceid-oid.patch
+Patch28: cups-dnssd-deviceid.patch
+Patch29: cups-ricoh-deviceid-oid.patch
+
+Patch31: cups-avahi.patch
+Patch32: cups-icc.patch
+Patch33: cups-systemd-socket.patch
- Patch34: cups-str3880.patch
Patch100: cups-lspp.patch
@@@ -209,11 -216,8 +206,11 @@@ The Common UNIX Printing System provide
UNIX® operating systems. This is the package that provides a PHP
module.
+%description ipptool
+Sends IPP requests to the specified URI and tests and/or displays the results.
+
%prep
- %setup -q -n %{name}-%{version}%{alphatag}
+ %setup -q
# Don't gzip man pages in the Makefile, let rpmbuild do it.
%patch1 -p1 -b .no-gzip-man
# Use the system pam configuration.
@@@ -236,53 -240,70 +233,50 @@@
%patch10 -p1 -b .peercred
# Maintain a cupsd.pid file.
%patch11 -p1 -b .pid
-# Fix orientation of page labels.
-%patch12 -p1 -b .page-label
# Fix implementation of com.redhat.PrinterSpooler D-Bus object.
-%patch13 -p1 -b .eggcups
+%patch12 -p1 -b .eggcups
# More sophisticated implementation of cupsGetPassword than getpass.
-%patch14 -p1 -b .getpass
+%patch13 -p1 -b .getpass
# Increase driverd timeout to 70s to accommodate foomatic.
-%patch15 -p1 -b .driverd-timeout
+%patch14 -p1 -b .driverd-timeout
# Only enforce maximum PPD line length when in strict mode.
-%patch16 -p1 -b .strict-ppd-line-length
+%patch15 -p1 -b .strict-ppd-line-length
# Re-open the log if it has been logrotated under us.
-%patch17 -p1 -b .logrotate
+%patch16 -p1 -b .logrotate
# Support for errno==ENOSPACE-based USB paper-out reporting.
-%patch18 -p1 -b .usb-paperout
+%patch17 -p1 -b .usb-paperout
# Simplify the DNSSD parts so they can build using the compat library.
-%patch19 -p1 -b .build
+%patch18 -p1 -b .build
# Re-initialise the resolver on failure in httpAddrGetList().
-%patch20 -p1 -b .res_init
+%patch19 -p1 -b .res_init
# Log extra debugging information if no filters are available.
-%patch21 -p1 -b .filter-debug
+%patch20 -p1 -b .filter-debug
# Allow the usb backend to understand old-style URI formats.
-%patch22 -p1 -b .uri-compat
+%patch21 -p1 -b .uri-compat
# Fix support for older CUPS servers in cupsGetDests.
-%patch23 -p1 -b .cups-get-classes
+%patch22 -p1 -b .cups-get-classes
# Fix temporary filename creation.
-%patch24 -p1 -b .str3382
-# Force the use of gnutls despite thread-safety concerns (bug #607159).
-%patch25 -p1 -b .force-gnutls
-# Perform locking for gnutls and avoid libgcrypt's broken
-# locking (bug #607159).
-%patch26 -p1 -b .serialize-gnutls
+%patch23 -p1 -b .str3382
# Use mode 0755 for binaries and libraries where appropriate.
-%patch27 -p1 -b .0755
+%patch25 -p1 -b .0755
# Handle SNMP supply level quirks (bug #581825).
-%patch28 -p1 -b .snmp-quirks
+%patch26 -p1 -b .snmp-quirks
# Add an SNMP query for HP's device ID OID (STR #3552).
-%patch29 -p1 -b .hp-deviceid-oid
+%patch27 -p1 -b .hp-deviceid-oid
# Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
-%patch30 -p1 -b .dnssd-deviceid
+%patch28 -p1 -b .dnssd-deviceid
# Add an SNMP query for Ricoh's device ID OID (STR #3552).
-%patch31 -p1 -b .ricoh-deviceid-oid
-# Adjust texttops output to be in natural orientation (STR #3563).
-# This fixes page-label orientation when texttops is used in the
-# filter chain (bug #572338).
-%patch32 -p1 -b .texttops-rotate-page
-# Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
-%patch33 -p1 -b .usb-parallel
-# Set the default RIPCache to 128m (STR #3535, bug #549901).
-%patch34 -p1 -b .str3535
-# Avoid busy loop in cups-polld (bug #720921).
-%patch35 -p1 -b .polld-busy-loop
-
-# Avahi support:
-# - discovery in the dnssd backend
-# - service announcement in the scheduler
-%patch40 -p1 -b .avahi-1-config
-%patch41 -p1 -b .avahi-2-backend
-%patch42 -p1 -b .avahi-3-timeouts
-%patch43 -p1 -b .avahi-4-poll
-%patch44 -p1 -b .avahi-5-services
+%patch29 -p1 -b .ricoh-deviceid-oid
+# Avahi support in the dnssd backend.
+#%patch31 -p1 -b .avahi
# ICC colord support.
-%patch45 -p1 -b .icc
+%patch32 -p1 -b .icc
+
+# Add support for systemd socket activation (patch from Lennart
+# Poettering).
+%patch33 -p1 -b .systemd-socket
- # Don't delete job data files when restarted (STR #3880).
- %patch34 -p1 -b .str3880
-
%if %lspp
# LSPP support.
%patch100 -p1 -b .lspp
@@@ -612,30 -632,23 +606,33 @@@ rm -rf $RPM_BUILD_ROO
%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
%{php_extdir}/phpcups.so
+%files ipptool
+%defattr(-,root,root)
+%{_bindir}/ipptool
+%dir %{_datadir}/cups/ipptool
+%{_datadir}/cups/ipptool/create-printer-subscription.test
+%{_datadir}/cups/ipptool/get-completed-jobs.test
+%{_datadir}/cups/ipptool/get-jobs.test
+%{_datadir}/cups/ipptool/ipp-1.1.test
+%{_datadir}/cups/ipptool/ipp-2.0.test
+%{_datadir}/cups/ipptool/ipp-2.1.test
+%{_datadir}/cups/ipptool/testfile.jpg
+%{_datadir}/cups/ipptool/testfile.pdf
+%{_datadir}/cups/ipptool/testfile.ps
+%{_datadir}/cups/ipptool/testfile.txt
+%{_mandir}/man1/ipptool.1.gz
+
%changelog
-* Tue Jul 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.8-1
-- 1.4.8
++* Tue Jul 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.5.0-1
++- 1.5.0
+
-* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-9
+* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.16.rc1
- Don't delete job data files when restarted (STR #3880).
-* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-8
+* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.15.rc1
- Ship an rpm macro for where to put driver executables.
-* Wed Jul 13 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-7
-- Avoid busy loop in cups-polld (bug #720921).
-
-* Thu Jul 7 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-6
-- Fix SNMP supply level crasher (STR #3875, bug #719057).
-
-* Thu Jul 7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-5
+* Thu Jul 7 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.14.rc1
- Undo last change which had no effect. We already remove the .SILENT
target from the Makefile as part of the build.
diff --cc sources
index 3ecb48f,8c064bb..e1f3ed2
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
- f2895d2df9e17aa2c5b05838a56e79a8 cups-1.5rc1-source.tar.bz2
-0ec52d3f3c69bc2ab5ed70c594edbce6 cups-1.4.8-source.tar.bz2
++e54ed09ede2340fc3014913333520fe4 cups-1.5.0-source.tar.bz2
More information about the scm-commits
mailing list