rpms/cups/F-13 cups.spec,1.606,1.607
Tim Waugh
twaugh at fedoraproject.org
Thu Jun 24 12:07:08 UTC 2010
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28552
Modified Files:
cups.spec
Log Message:
* Thu Jun 24 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-4
- Use gnutls again but disable threading (bug #607159).
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-13/cups.spec,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -p -r1.606 -r1.607
--- cups.spec 22 Jun 2010 09:47:50 -0000 1.606
+++ cups.spec 24 Jun 2010 12:07:08 -0000 1.607
@@ -8,7 +8,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -91,7 +91,7 @@ Provides: cupsddk-drivers = 1.2.3-7
Conflicts: kdelibs < 6:3.5.2-6
BuildRequires: pam-devel pkgconfig
-BuildRequires: openssl-devel libacl-devel
+BuildRequires: gnutls-devel libacl-devel
BuildRequires: openldap-devel
BuildRequires: make >= 1:3.80
BuildRequires: php-devel, pcre-devel
@@ -137,7 +137,7 @@ Summary: Common Unix Printing System - d
Group: Development/Libraries
License: LGPLv2
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: openssl-devel
+Requires: gnutls-devel
Requires: krb5-devel
Requires: zlib-devel
Obsoletes: cupsddk-devel < 1.2.3-7
@@ -295,9 +295,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-pr
--enable-lspp \
%endif
--with-log-file-perm=0600 --enable-pie --enable-relro \
- --enable-pdftops --with-pdftops=pdftops \
+ --with-pdftops=pdftops \
--with-dbusdir=%{_sysconfdir}/dbus-1 \
--with-php=/usr/bin/php-cgi --enable-avahi \
+ --disable-threads --enable-gnutls \
localedir=%{_datadir}/locale
# If we got this far, all prerequisite libraries must be here.
@@ -561,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
+* Thu Jun 24 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-4
+- Use gnutls again but disable threading (bug #607159).
+
* Tue Jun 22 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-3
- Rebuilt to keep correct package n-v-r ordering between releases.
More information about the scm-commits
mailing list