rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f19'

Browse Source
This commit is contained in:
Tim Waugh 2013-07-24 09:11:27 +01:00
commit 4ca8dddf86
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cups-multilib.patch
View File

@ -7,10 +7,10 @@ diff -up cups-1.5b1/cups-config.in.multilib cups-1.5b1/cups-config.in
includedir=@includedir@ includedir=@includedir@
-libdir=@libdir@ -libdir=@libdir@
-imagelibdir=@libdir@ -imagelibdir=@libdir@
+# Fetch libdir from gnutls's pkg-config script. This is a bit +# Fetch libdir from openssl's pkg-config script. This is a bit
+# of a cheat, but the cups-devel package requires gnutls-devel anyway. +# of a cheat, but the cups-devel package requires openssl-devel anyway.
+libdir=`pkg-config --variable=libdir gnutls` +libdir=`pkg-config --variable=libdir openssl`
+imagelibdir=`pkg-config --variable=libdir gnutls` +imagelibdir=`pkg-config --variable=libdir openssl`
datarootdir=@datadir@ datarootdir=@datadir@
datadir=@datadir@ datadir=@datadir@
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@

5
cups.spec
View File

@ -14,7 +14,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7 Version: 1.7
Release: 0.20.%{prever}%{?dist} Release: 0.21.%{prever}%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -630,6 +630,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Wed Jul 24 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.21.rc1
- Fixed cups-config, broken by last change (bug #987660).
* Mon Jul 22 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.20.rc1 * Mon Jul 22 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.20.rc1
- Removed stale comment in spec file. - Removed stale comment in spec file.
- Link against OpenSSL instead of GnuTLS. - Link against OpenSSL instead of GnuTLS.