From 58a593e9fe890e770b3ce6c356491e49e6d72d1e Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 24 Jul 2013 09:04:35 +0100
Subject: [PATCH] Fixed cups-config, broken by last change (bug #987660).

Resolves: rhbz#987660
---
 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 3c6bc39..14a8959 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 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`
++# 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`
  datarootdir=@datadir@
  datadir=@datadir@
  sysconfdir=@sysconfdir@
diff --git a/cups.spec b/cups.spec
index 05f521e..560ea09 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.6.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -634,6 +634,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Wed Jul 24 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-4
+- Fixed cups-config, broken by last change (bug #987660).
+
 * Mon Jul 22 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-3
 - Removed stale comment in spec file.
 - Link against OpenSSL instead of GnuTLS.