From d55138bf56132d88441f7a245c31fd680e4d348f Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Mon, 16 Feb 2015 15:24:33 +0100 Subject: [PATCH] Fixed multilib.patch to check for gnutls instead of openssl. --- cups-multilib.patch | 8 ++++---- cups.spec | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cups-multilib.patch b/cups-multilib.patch index 14a8959..3c6bc39 100644 --- a/cups-multilib.patch +++ b/cups-multilib.patch @@ -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@ diff --git a/cups.spec b/cups.spec index e2179e0..8860a56 100644 --- a/cups.spec +++ b/cups.spec @@ -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 - 1:2.0.2-2 +- Fixed multilib.patch to check for gnutls instead of openssl. + * Tue Feb 10 2015 Jiri Popelka - 1:2.0.2-1 - 2.0.2