From 8dc0285c8610fd8d7d27192aa5b4eb62d0c4f08d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 22 Jul 2013 14:41:55 +0100 Subject: [PATCH 1/2] Link against OpenSSL instead of GnuTLS. --- cups.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cups.spec b/cups.spec index 0ea0c4d..b6752ff 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.6.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -77,7 +77,7 @@ Requires: /usr/sbin/alternatives Provides: lpd lpr cupsddk cupsddk-drivers BuildRequires: pam-devel pkgconfig -BuildRequires: gnutls-devel libacl-devel +BuildRequires: openssl-devel libacl-devel BuildRequires: openldap-devel BuildRequires: libusb1-devel BuildRequires: krb5-devel @@ -117,7 +117,7 @@ Summary: CUPS printing system - development environment Group: Development/Libraries License: LGPLv2 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: gnutls-devel +Requires: openssl-devel Requires: krb5-devel Requires: zlib-devel Provides: cupsddk-devel @@ -280,7 +280,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1" --with-dbusdir=%{_sysconfdir}/dbus-1 \ --with-php=/usr/bin/php-cgi \ --enable-avahi \ - --enable-threads --enable-gnutls \ + --enable-threads --enable-openssl \ --enable-webif \ --with-xinetd=no \ localedir=%{_datadir}/locale @@ -636,6 +636,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Mon Jul 22 2013 Tim Waugh - 1:1.6.3-3 +- Link against OpenSSL instead of GnuTLS. + * Thu Jul 18 2013 Tim Waugh - 1:1.6.3-2 - Fixed downoad URL to point to the actual source, not a download page. From 07b68eeeb1296647363ca34e8d4bd1a2caff89d9 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 22 Jul 2013 14:47:47 +0100 Subject: [PATCH 2/2] Removed stale comment in spec file. --- cups.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cups.spec b/cups.spec index b6752ff..05f521e 100644 --- a/cups.spec +++ b/cups.spec @@ -331,8 +331,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/classes.conf touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/subscriptions.conf - -# This is %%ghost'ed, but needs to be created in %%install anyway. touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/lpoptions # LSB 3.2 printer driver directory @@ -637,6 +635,7 @@ rm -f %{cups_serverbin}/backend/smb %changelog * Mon Jul 22 2013 Tim Waugh - 1:1.6.3-3 +- Removed stale comment in spec file. - Link against OpenSSL instead of GnuTLS. * Thu Jul 18 2013 Tim Waugh - 1:1.6.3-2