packages: apr-util/apr-util.spec - updated to 1.4.1 - build crypto modules ...

Fri Dec 16 17:28:14 CET 2011

Author: qboosh                       Date: Fri Dec 16 16:28:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.4.1
- build crypto modules (both nss and openssl)

---- Files affected:
packages/apr-util:
   apr-util.spec (1.96 -> 1.97) 

---- Diffs:

================================================================
Index: packages/apr-util/apr-util.spec
diff -u packages/apr-util/apr-util.spec:1.96 packages/apr-util/apr-util.spec:1.97

--- packages/apr-util/apr-util.spec:1.96	Fri Sep 30 18:33:24 2011
+++ packages/apr-util/apr-util.spec	Fri Dec 16 17:28:08 2011
@@ -9,7 +9,9 @@
 %bcond_with	sqlite2	# with SQLite 2.x DBD module
 %bcond_without	sqlite3	# without SQLite3 DBD module
 %bcond_without	ldap	# without LDAP module
-%bcond_without	tests
+%bcond_without	nss	# without NSS crypto module
+%bcond_without	openssl	# without OpenSSL crypto module
+%bcond_without	tests	# don't perform "make check"
 
 # define	dbver	db50
 %if 0%{!?dbver:1}
@@ -32,13 +34,13 @@
 Summary:	A companion library to Apache Portable Runtime
 Summary(pl.UTF-8):	Biblioteka towarzysząca Apache Portable Runtime
 Name:		apr-util
-Version:	1.3.12
-Release:	2
+Version:	1.4.1
+Release:	1
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
 Source0:	http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5:	0f671b037ca62751a8a7005578085560
+# Source0-md5:	52b31b33fb1aa16e65ddaefc76e41151
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-config-noldap.patch
 Patch2:		%{name}-libtool.patch
@@ -60,7 +62,9 @@
 %{?with_freetds:BuildRequires:	freetds-devel}
 BuildRequires:	libtool
 %{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_nss:BuildRequires:	nss-devel}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
+%{?with_openssl:BuildRequires:	openssl-devel}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	rpm >= 4.4.9-56
 %{?with_sqlite2:BuildRequires:	sqlite-devel >= 2}
@@ -79,17 +83,29 @@
 Biblioteka towarzysząca dla biblioteki Apache Portable Runtime
 (przenośnej biblioteki uruchomieniowej).
 
-%package dbm-db
-Summary:	DBM driver for DB
-Summary(pl.UTF-8):	Sterownik DBM dla DB
+%package crypto-nss
+Summary:	APR cryptographic module using Mozilla NSS library
+Summary(pl.UTF-8):	Moduł kryptograficzny APR wykorzystujący bibliotekę Mozilla NSS
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description dbm-db
-DBM driver for DB.
+%description crypto-nss
+APR cryptographic module using Mozilla NSS library.
 
-%description dbm-db -l pl.UTF-8
-Sterownik DBM dla DB.
+%description crypto-nss -l pl.UTF-8
+Moduł kryptograficzny APR wykorzystujący bibliotekę Mozilla NSS.
+
+%package crypto-openssl
+Summary:	APR cryptographic module using OpenSSL library
+Summary(pl.UTF-8):	Moduł kryptograficzny APR wykorzystujący bibliotekę OpenSSL
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description crypto-openssl
+APR cryptographic module using OpenSSL library.
+
+%description crypto-openssl -l pl.UTF-8
+Moduł kryptograficzny APR wykorzystujący bibliotekę OpenSSL.
 
 %package dbd-freetds
 Summary:	DBD driver for FreeTDS (Sybase/MS SQL)
@@ -177,6 +193,18 @@
 %description dbd-sqlite3 -l pl.UTF-8
 Sterownik DBD dla SQLite 3.
 
+%package dbm-db
+Summary:	DBM driver for DB
+Summary(pl.UTF-8):	Sterownik DBM dla DB
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description dbm-db
+DBM driver for DB.
+
+%description dbm-db -l pl.UTF-8
+Sterownik DBM dla DB.
+
 %package ldap
 Summary:	APR LDAP driver
 Summary(pl.UTF-8):	Sterownik APR dla LDAP
@@ -222,9 +250,7 @@
 %patch2 -p1
 %patch3 -p1
 
-# be sure to link with db version requested
-%{__sed} -i -e 's/db4 db\|db5 db//' build/dbm.m4
-
+# ensure system expat is used
 %{__rm} -r xml/expat
 
 echo '
@@ -254,6 +280,7 @@
 	--enable-layout=PLD \
 	--with-apr=%{_bindir}/apr-1-config \
 	--with-berkeley-db=%{_prefix} \
+	--with-crypto \
 	--with-dbm=%{dbver} \
 	--with-iconv=%{_prefix} \
 %if %{with ldap}
@@ -261,6 +288,8 @@
 	--with-ldap-include=%{_prefix}/include \
 	--with-ldap-lib=%{_libdir} \
 %endif
+	%{?with_nss:--with-nss} \
+	%{?with_openssl:--with-openssl} \
 	%{!?with_freetds:--without-freetds} \
 	%{?with_mysql:--with-mysql=%{_prefix}} \
 	%{!?with_odbc:--without-odbc} \
@@ -295,10 +324,19 @@
 %attr(755,root,root) %ghost %{_libdir}/libaprutil-1.so.0
 %dir %{_libdir}/apr-util-1
 
-%files dbm-db
+%if %{with nss}
+%files crypto-nss
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbm_db-1.so
-%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbm_db.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_nss-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_nss.so
+%endif
+
+%if %{with openssl}
+%files crypto-openssl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_openssl-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_openssl.so
+%endif
 
 %if %{with freetds}
 %files dbd-freetds
@@ -349,6 +387,11 @@
 %attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_sqlite3.so
 %endif
 
+%files dbm-db
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbm_db-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbm_db.so
+
 %if %{with ldap}
 %files ldap
 %defattr(644,root,root,755)
@@ -375,6 +418,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2011/12/16 16:28:08  qboosh
+- updated to 1.4.1
+- build crypto modules (both nss and openssl)
+
 Revision 1.96  2011/09/30 16:33:24  glen
 - hack for ac-alpha
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apr-util/apr-util.spec?r1=1.96&r2=1.97&f=u

