Merge branch 'f15'

This commit is contained in:
Tim Waugh 2011-07-07 09:59:52 +01:00
commit 70134501f4

View File

@ -15,7 +15,7 @@
Summary: Common Unix Printing System
Name: cups
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}%{alphatag}/cups-%{version}%{alphatag}-source.tar.bz2
@ -319,7 +319,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
localedir=%{_datadir}/locale
# If we got this far, all prerequisite libraries must be here.
make %{?_smp_mflags}
make %{?_smp_mflags} V=1
%install
rm -rf $RPM_BUILD_ROOT
@ -620,6 +620,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ipptool.1.gz
%changelog
* Thu Jul 7 2011 Tim Waugh <twaugh@redhat.com> 1:1.5-0.13.rc1
- Make build log verbose enough to include compiler flags used.
* Tue Jul 5 2011 Tim Waugh <twaugh@redhat.com> 1:1.5-0.12.rc1
- Removed udev rules file as it is no longer necessary.