[cups/f13/master: 2/2] Merge branch 'f12' into f13
Tim Waugh
twaugh at fedoraproject.org
Fri Aug 20 11:05:16 UTC 2010
commit 7fe5158771bffb89e451c6d67b92066b70f7d467
Merge: 482fd1a 1ccc93f
Author: Tim Waugh <twaugh at redhat.com>
Date: Fri Aug 20 11:58:13 2010 +0100
Merge branch 'f12' into f13
cups-str3608.patch | 49 +++++++++++++++++++++++++++++++++++--------------
cups.spec | 5 ++++-
2 files changed, 39 insertions(+), 15 deletions(-)
---
diff --cc cups.spec
index f97005c,fa5db42..640c040
--- a/cups.spec
+++ b/cups.spec
@@@ -8,7 -8,7 +8,7 @@@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.4
- Release: 8%{?dist}
-Release: 7%{?dist}
++Release: 9%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -571,19 -578,12 +571,22 @@@ rm -rf $RPM_BUILD_ROO
%{php_extdir}/phpcups.so
%changelog
-* Fri Aug 20 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-7
++* Fri Aug 20 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-9
+ - Use better upstream fix for STR #3608 (bug #606909).
+
-* 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,
More information about the scm-commits
mailing list