[cups/f16: 2/2] Merge branch 'f15' into f16

Wed Dec 21 11:50:42 UTC 2011

commit 8d23b6cc1c78ffc10343d5c00e04e2520b8346fd
Merge: 3675f09 7870e7a
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Dec 21 11:28:35 2011 +0000

    Merge branch 'f15' into f16

 cups.spec       |    5 ++++-
 textonly.filter |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc cups.spec
index bef3719,e28dd5c..cad3ce5

--- a/cups.spec
+++ b/cups.spec
@@@ -12,8 -12,8 +12,8 @@@
  
  Summary: Common Unix Printing System
  Name: cups
 -Version: 1.4.8
 -Release: 7%{?dist}
 +Version: 1.5.0
- Release: 23%{?dist}
++Release: 24%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -643,90 -638,20 +643,93 @@@ 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
 -* Wed Dec 21 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-7
++* Wed Dec 21 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-24
+ - Fixed textonly filter to work with single copies (bug #738412).
+ 
 -* Fri Dec  9 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-6
 +* Fri Dec  9 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-23
  - Detangle cups-serverbin-compat.patch from cups-lspp.patch.
 +- Bind to datagram socket as well in systemd cups.socket unit file, to
 +  prevent that port being stolen by another service (bug #760070).
 +
 +* Fri Nov 11 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-22
 +- Fixed trigger (bug #748841).
  
 -* Wed Sep 28 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-5
 +* Wed Nov  9 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-21
 +- Set correct systemd service default on upgrade, once updates are
 +  applied (bug #748841).
 +
 +* Fri Nov  4 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-20
 +- Set the correct PostScript command filter for e.g. foomatic queues
 +  (STR #3973).
 +
 +* Mon Oct 31 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-19
 +- Set correct systemd service default on upgrade (bug #748841).
 +
 +* Wed Oct 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-18
 +- Make sure to guard against retrying the Avahi connection whilst
 +  already doing so (Ubuntu #877967).
 +
 +* Tue Oct 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-17
 +- Use libsystemd-daemon instead of bundling sd-daemon.c.
 +
 +* Tue Oct 11 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-16
 +- Use upstream fix for driverd issue (bug #742989).
 +- Array handling fixes for DNSSDPrinters.
 +- Array handling fixes for Avahi poll implementation.
 +- Increase client blocking timeout from 30s to 70s (bug #744715).
 +- Set BindIPv6Only=ipv6-only in systemd socket unit file as better fix
 +  for bug #737230.
 +
 +* Fri Oct  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-15
 +- Fixed Timeouts array comparison function (Ubuntu #860691).
 +
 +* Wed Oct  5 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-14
 +- Handle "localhost" resolving to 127.0.0.1 on IPv6-addressed systems
 +  (bug #737230).
 +
 +* Tue Oct  4 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-13
 +- Work around PPDs cache handling issue (bug #742989).
 +
 +* Tue Oct  4 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-12
 +- More fixes for systemd socket activation:
 +  - relax permissions check for domain socket in libcups.
 +  - initialise addrlen before calling getsockname().
 +
 +* Mon Oct 03 2011 Richard Hughes <rhughes at redhat.com> 1:1.5.0-11
 +- Updated colord patch with fixes to DeleteDevice.
 +- Resolves https://bugzilla.redhat.com/show_bug.cgi?id=741697
 +
 +* Wed Sep 28 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-10
  - Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).
  
 -* Wed Sep 14 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-4
 +* Thu Sep 22 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-9
 +- Fixed systemd socket activation support (bug #738709, bug #738710).
 +
 +* Wed Sep 14 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-8
  - Prevent libcups crash in cups-get-classes patch (bug #736698).
  
 -* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-3
 +* Thu Sep  1 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-7
 +- Use PathExistsGlob instead of DirectoryNotEmpty in cups.path
 +  (bug #734435).
 +
 +* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-6
  - Tighten explicit libs sub-package requirement so that it includes
    the correct architecture as well (bug #731421 comment #8).
  
