packages: ucommon/ucommon.spec - added gnutls bcond

qboosh qboosh at pld-linux.org
Tue Jan 3 16:36:36 CET 2012


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

---- Files affected:
packages/ucommon:
   ucommon.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ucommon/ucommon.spec
diff -u packages/ucommon/ucommon.spec:1.1 packages/ucommon/ucommon.spec:1.2
--- packages/ucommon/ucommon.spec:1.1	Tue Jan  3 15:37:31 2012
+++ packages/ucommon/ucommon.spec	Tue Jan  3 16:36:31 2012
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
+%bcond_with	gnutls		# use GnuTLS instead of OpenSSL [needs update: recent gnutls no longer uses libgcrypt]
 #
 Summary:	GNU uCommon C++ - very light-weight C++ framework
 Summary(pl.UTF-8):	GNU uCommon C++ - bardzo lekki szkielet C++
@@ -14,8 +15,9 @@
 # Source0-md5:	2aa7bec3ad5ef9f83149811d9424f291
 URL:		http://www.gnu.org/software/commoncpp/
 %{?with_apidocs:BuildRequires:	doxygen}
+%{?with_gnutls:BuildRequires:	gnutls-devel >= 2.8.0}
 BuildRequires:	libstdc++-devel >= 5:3.0
-BuildRequires:	openssl-devel >= 0.9.7
+%{!?with_gnutls:BuildRequires:	openssl-devel >= 0.9.7}
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,8 +46,9 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki uCommon C++
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{?with_gnutls:Requires:	gnutls-devel >= 2.8.0}
 Requires:	libstdc++-devel >= 5:3.0
-Requires:	openssl-devel >= 0.9.7
+%{!?with_gnutls:Requires:	openssl-devel >= 0.9.7}
 
 %description devel
 Header files for uCommon C++ library.
@@ -92,16 +95,9 @@
 %setup -q
 
 %build
-# if ac/am/lt/* rebuilding is necessary, do it in this order and add
-# appropriate BuildRequires
-#%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__autoheader}
-#%{__automake}
 %configure \
 	ac_cv_lib_nsl_inet_ntop=no \
-	--with-sslstack=openssl
+	--with-sslstack=%{?with_gnutls:gnutls}%{!?with_gnutls:openssl}
 %{__make}
 
 %if %{with apidocs}
@@ -180,5 +176,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/01/03 15:36:31  qboosh
+- added gnutls bcond
+
 Revision 1.1  2012/01/03 14:37:31  qboosh
 - new
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ucommon/ucommon.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list