Merge branch 'f22' into f23

This commit is contained in:
Jiri Popelka 2015-07-28 13:05:28 +02:00
commit 25f393d760

View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.0.3 Version: 2.0.3
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source0: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 Source0: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -71,7 +71,7 @@ Requires: %{name}-client%{?_isa} = %{epoch}:%{version}-%{release}
Provides: cupsddk cupsddk-drivers Provides: cupsddk cupsddk-drivers
BuildRequires: pam-devel pkgconfig BuildRequires: pam-devel pkgconfig
BuildRequires: gnutls-devel BuildRequires: pkgconfig(gnutls)
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libusb-1.0)
@ -618,6 +618,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Jul 28 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.0.3-5
- BuildRequires: gnutls-devel -> pkgconfig(gnutls)
* Tue Jul 07 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.0.3-4 * Tue Jul 07 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.0.3-4
- RPM_BUILD_ROOT -> %%{buildroot}, put braces around lspp and use_alternatives - RPM_BUILD_ROOT -> %%{buildroot}, put braces around lspp and use_alternatives