[cups/f13/master: 2/2] Merge branch 'f12' into f13

[Tim Waugh]

commit 482fd1a14347d374ac2530c672208d5ea493673c
Merge: 5619b50 6729d05
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Aug 13 11:11:42 2010 +0100

    Merge branch 'f12' into f13

 cups.init |   12 +++++++-----
 cups.spec |    5 ++++-
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --cc cups.spec
index ffc4bf1,e7a3446..f97005c
--- a/cups.spec
+++ b/cups.spec
@@@ -8,7 -8,7 +8,7 @@@
  Summary: Common Unix Printing System
  Name: cups
  Version: 1.4.4
- Release: 7%{?dist}
 -Release: 6%{?dist}
++Release: 8%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -571,16 -578,9 +571,19 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Tue Aug  3 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-6
++* Fri Aug 13 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-8
+ - Specify udevadm trigger action in initscript (bug #623959).
 -- Build requires gnutls-devel not openssl-devel.
++
 +* Tue Aug  3 2010 Tim Waugh <twaugh at redhat.com>
 +- Merged F-12 change:
 +  - Use numeric addresses for interfaces unless HostNameLookups are
 +    turned on (bug #583054).
 +
 +* Tue Jul 13 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.4-7
 +- Added restartlog to initscript usage output (bug #612996).
 +
 +* Mon Jul 12 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.4-6
 +- Moved LICENSE.txt to libs sub-package.
  
  * Mon Jun 28 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-5
  - Avoid empty notify-subscribed-event attributes (bug #606909,