Author: charles Date: Mon May 29 21:15:25 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added gnutls and static_libs bconds
---- Files affected:
SPECS:
cups.spec (1.156 -> 1.157)
---- Diffs:
================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.156 SPECS/cups.spec:1.157
--- SPECS/cups.spec:1.156 Sat May 27 07:11:35 2006
+++ SPECS/cups.spec Mon May 29 23:15:20 2006
@@ -5,8 +5,10 @@
# - remove obsolete /etc/cups/certs (trigger?)
#
# Conditional build:
-%bcond_without php # don't build PHP extension
-%bcond_without perl # don't build Perl extension
+%bcond_with gnutls # use GNU TLS for SSL/TLS support (instead of
OpenSSL)
+%bcond_without php # don't build PHP extension
+%bcond_without perl # don't build Perl extension
+%bcond_without static_libs # don't build static library
#
%include /usr/lib/rpm/macros.perl
%define pdir CUPS
@@ -35,13 +37,14 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: dbus-devel
+%{?with_gnutls:BuildRequires: gnutls-devel}
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: openldap-devel
BuildRequires: openslp-devel
-BuildRequires: openssl-devel
+%{!?with_gnutls:BuildRequires: openssl-devel}
BuildRequires: pam-devel
%{?with_php:BuildRequires: php-devel >= 4:5.0.0}
BuildRequires: pkgconfig
@@ -254,14 +257,16 @@
%configure \
--libdir=%{_ulibdir} \
--enable-shared \
- --enable-static \
+ %{?with_static_libs:--enable-static} \
--enable-ssl \
- --enable-openssl \
- --disable-gnutls \
+ --%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \
+ --%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \
--disable-cdsassl \
--enable-dbus \
%{?debug:--enable-debug} \
- --with-docdir=%{_ulibdir}/%{name}/cgi-bin
+ --with-docdir=%{_ulibdir}/%{name}/cgi-bin \
+ %{?with_php:--with-php}
+
%{__make}
%{__perl} -pi -e 's#-I\.\.\/\.\.#-I../.. -I../../cups#g' scripting/php/Makefile
@@ -509,9 +514,11 @@
#%lang(fr) %{_mandir}/fr/man1/cups-config*
#%lang(es) %{_mandir}/es/man1/cups-config*
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/*.a
+%endif
%if %{with perl}
%files -n perl-cups
@@ -549,6 +556,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.157 2006/05/29 21:15:20 charles
+- added gnutls and static_libs bconds
+
Revision 1.156 2006/05/27 05:11:35 charles
- added -jobs-header_tmpl_pl.patch (spoiled href)
- added %ghost /var/cache/cups/ppds.dat; proper perms
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/cups.spec?r1=1.156&r2=1.157&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
