packages: commoncpp2/commoncpp2.spec - added gnutls bcond

[qboosh]

Author: qboosh                       Date: Tue Jan  3 15:31:31 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added gnutls bcond

---- Files affected:
packages/commoncpp2:
   commoncpp2.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/commoncpp2/commoncpp2.spec
diff -u packages/commoncpp2/commoncpp2.spec:1.31 packages/commoncpp2/commoncpp2.spec:1.32
--- packages/commoncpp2/commoncpp2.spec:1.31	Mon Jan  2 20:46:10 2012
+++ packages/commoncpp2/commoncpp2.spec	Tue Jan  3 16:31:26 2012
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
+%bcond_with	gnutls		# use GnuTLS instead of OpenSSL [needs update: recent gnutls no longer uses libgcrypt]
 #
 Summary:	A GNU package for creating portable C++ programs
 Summary(pl.UTF-8):	Pakiet GNU do tworzenia przenośnych programów w C++
@@ -20,10 +21,11 @@
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	doxygen
+%{?with_gnutls:BuildRequires:	gnutls-devel}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel
-BuildRequires:	openssl-devel
+%{!?with_gnutls:BuildRequires:	openssl-devel}
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,9 +54,10 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki commoncpp2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{?with_gnutls:Requires:	gnutls-devel}
 Requires:	libstdc++-devel
 Requires:	libxml2-devel
-Requires:	openssl-devel
+%{!?with_gnutls:Requires:	openssl-devel}
 Requires:	zlib-devel
 
 %description devel
@@ -90,10 +93,11 @@
 %{__automake}
 %configure \
 	%{!?with_static_libs:--disable-static} \
-	--with-openssl
+	%{?with_gnutls:--with-gnutls} \
+	%{!?with_gnutls:--with-openssl}
 
 # ensure netfilter is detected
-grep 'HAVE_NAT_NETFILTER 1' config.h || exit 1
+grep -q 'HAVE_NAT_NETFILTER 1' config.h || exit 1
 
 %{__make} -j1
 
@@ -150,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2012/01/03 15:31:26  qboosh
+- added gnutls bcond
+
 Revision 1.31  2012/01/02 19:46:10  qboosh
 - adjusted License: upstream calls this "runtime exception"
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/commoncpp2/commoncpp2.spec?r1=1.31&r2=1.32&f=u