rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Use gnutls again but disable threading (bug #607159).

Browse Source
This commit is contained in:
Tim Waugh 2010-06-24 12:07:08 +00:00
parent 3fec50e02a
commit 12ee3e5cb8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups.spec
View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.4 Version: 1.4.4
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 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 Conflicts: kdelibs < 6:3.5.2-6
BuildRequires: pam-devel pkgconfig BuildRequires: pam-devel pkgconfig
BuildRequires: openssl-devel libacl-devel BuildRequires: gnutls-devel libacl-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: make >= 1:3.80 BuildRequires: make >= 1:3.80
BuildRequires: php-devel, pcre-devel BuildRequires: php-devel, pcre-devel
@ -137,7 +137,7 @@ Summary: Common Unix Printing System - development environment
Group: Development/Libraries Group: Development/Libraries
License: LGPLv2 License: LGPLv2
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: openssl-devel Requires: gnutls-devel
Requires: krb5-devel Requires: krb5-devel
Requires: zlib-devel Requires: zlib-devel
Obsoletes: cupsddk-devel < 1.2.3-7 Obsoletes: cupsddk-devel < 1.2.3-7
@ -295,9 +295,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
--enable-lspp \ --enable-lspp \
%endif %endif
--with-log-file-perm=0600 --enable-pie --enable-relro \ --with-log-file-perm=0600 --enable-pie --enable-relro \
--enable-pdftops --with-pdftops=pdftops \ --with-pdftops=pdftops \
--with-dbusdir=%{_sysconfdir}/dbus-1 \ --with-dbusdir=%{_sysconfdir}/dbus-1 \
--with-php=/usr/bin/php-cgi --enable-avahi \ --with-php=/usr/bin/php-cgi --enable-avahi \
--disable-threads --enable-gnutls \
localedir=%{_datadir}/locale localedir=%{_datadir}/locale
# If we got this far, all prerequisite libraries must be here. # If we got this far, all prerequisite libraries must be here.
@ -561,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Thu Jun 24 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-4
- Use gnutls again but disable threading (bug #607159).
* Tue Jun 22 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-3 * Tue Jun 22 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-3
- Rebuilt to keep correct package n-v-r ordering between releases. - Rebuilt to keep correct package n-v-r ordering between releases.