[cups: 3/3] Merge branch 'f15'

[Tim Waugh]

commit 70134501f44146b42b2d4e41d544f9db37f99a27
Merge: a4f3be6 efb27f9
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Jul 7 09:59:52 2011 +0100

    Merge branch 'f15'

 cups.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc cups.spec
index af27937,20aad6d..003f5c4
--- a/cups.spec
+++ b/cups.spec
@@@ -10,17 -10,19 +10,17 @@@
  # 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.4.7
 -Release: 4%{?dist}
 +Version: 1.5
- Release: 0.12.%{alphatag}%{?dist}
++Release: 0.13.%{alphatag}%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
 -Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
 -# Our initscript
 -Source1: cups.init
 +Source: http://ftp.easysw.com/pub/cups/%{version}%{alphatag}/cups-%{version}%{alphatag}-source.tar.bz2
  # 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
@@@ -603,62 -623,28 +603,65 @@@ 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
 -* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-4
++* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.13.rc1
+ - Make build log verbose enough to include compiler flags used.
+ 
 -* Wed Jun 29 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-3
 +* Tue Jul  5 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.12.rc1
 +- Removed udev rules file as it is no longer necessary.
 +
 +* Tue Jul  5 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.11.rc1
 +- Add support for systemd socket activation (patch from Lennart
 +  Poettering).
 +
 +* Wed Jun 29 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.10.rc1
 +- Don't use portreserve any more.  Better approach is to use systemd
 +  socket activation (not yet done).
 +
 +* Wed Jun 29 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.9.rc1
 +- Ship systemd service unit instead of SysV initscript (bug #690766).
 +
 +* Wed Jun 29 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.8.rc1
  - Tag localization files correctly (bug #716421).
  
 -* Tue Jun 28 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-2
 -- Updated avahi patches.
 +* Wed Jun 15 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.5-0.7.rc1
 +- 1.5rc1
 +
 +* Sat Jun 04 2011 Richard Hughes <rhughes at redhat.com> 1:1.5-0.6.b2
 +- Updated colord patch with fixes from Tim Waugh.
 +
 +* Tue May 31 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.5-0.5.b2
 +- enable LSPP support again
  
 -* Tue Jun 28 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-1
 -- 1.4.7.
 +* Tue May 31 2011 Richard Hughes <rhughes at redhat.com> 1:1.5-0.4.b2
 +- Updated colord patch against 1.5 upstream and fixes from Tim Waugh.
  
 -* Fri Jun  3 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-20
 -- Use correct port number when publishing services through Avahi
 -  (Ubuntu #792309).
 +* Tue May 31 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.5-0.3.b2
 +- fix lspp.patch to not include "config.h" in cups/cups.h (#709384)
  
 -* Fri Jun  3 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-19
 -- Don't crash when unable to connect to D-Bus.
 +* Thu May 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.5-0.2.b2
 +- 1.5b2
  
 -* Fri Jun 03 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-18
 -- Set the default RIPCache to 128m (STR #3535, bug #549901).
 +* Tue May 24 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.5-0.1.b1
 +- 1.5b1
 +  - removed cups-texttops-rotate-page.patch (#572338 is CANTFIX)
 +  - removed cups-page-label.patch (#520141 seems to be CANTFIX)
  
  * Wed May 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-17
  - Package parallel port printer device nodes (bug #678804).