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

[Tim Waugh]

commit 4d5db8941aed482c674a7428ce348f4a1c08f4e1
Merge: 0b72bc0 f4afb07
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jul 15 17:41:36 2011 +0100

    Merge branch 'f15'

 cups.spec   |   11 ++++++++++-
 macros.cups |    1 +
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 0bfa384,63022b9..2dcc908
--- 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: 8%{?dist}
 +Version: 1.5
- Release: 0.14.%{alphatag}%{?dist}
++Release: 0.15.%{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
@@@ -34,8 -36,9 +34,9 @@@ Source8: cups.cro
  # Filter and PPD for textonly printing
  Source9: textonly.filter
  Source10: textonly.ppd
+ Source11: macros.cups
  Patch1: cups-no-gzip-man.patch
 -Patch2: cups-1.1.16-system-auth.patch
 +Patch2: cups-system-auth.patch
  Patch3: cups-multilib.patch
  Patch4: cups-serial.patch
  Patch5: cups-banners.patch
@@@ -602,24 -635,17 +608,27 @@@ 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 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.