Fixed multilib.patch to check for gnutls instead of openssl.

This commit is contained in:
Jiri Popelka 2015-02-16 15:24:33 +01:00
parent 9347f32db4
commit d55138bf56
2 changed files with 8 additions and 5 deletions

View File

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

View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 2.0.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Url: http://www.cups.org/
Source0: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -605,6 +605,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
* Mon Feb 16 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.0.2-2
- Fixed multilib.patch to check for gnutls instead of openssl.
* Tue Feb 10 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.0.2-1
- 2.0.2