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

[Tim Waugh]

commit 4cfc57816587c25b8b0dd7904c5c2003fe797fea
Merge: 39d5c4b b390ea2
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Aug 19 15:19:48 2011 +0100

    Merge branch 'f15' into f16

 cups.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc cups.spec
index 2572145,aedcf62..5bd6d9e
--- a/cups.spec
+++ b/cups.spec
@@@ -12,8 -12,8 +12,8 @@@
  
  Summary: Common Unix Printing System
  Name: cups
 -Version: 1.4.8
 -Release: 3%{?dist}
 +Version: 1.5.0
- Release: 5%{?dist}
++Release: 6%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -622,45 -635,30 +622,49 @@@ 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
 -* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-3
++* 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).
+ 
 -* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-2
 +* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-5
  - Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).
  
 -* Tue Jul 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.8-1
 -- 1.4.8
 +* Wed Aug 17 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-4
 +- Enable systemd units by default (bug #731421).
  
 -* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-9
 -- Don't delete job data files when restarted (STR #3880).
 +* Mon Aug  8 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-3
 +- Updated avahi support to register sub-types.
  
 -* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-8
 -- Ship an rpm macro for where to put driver executables.
 +* Fri Aug  5 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-2
 +- Ported avahi support from 1.4.
 +
 +* Tue Jul 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.5.0-1
 +- 1.5.0
  
 -* Wed Jul 13 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-7
 -- Avoid busy loop in cups-polld (bug #720921).
 +* 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).
  
 -* Thu Jul  7 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-6
 -- Fix SNMP supply level crasher (STR #3875, bug #719057).
 +* 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.
  
 -* 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.