SPECS: apr-util.spec - fix pkgconfig file, remove unneeded dbd .la...
glen
glen at pld-linux.org
Mon Jan 2 09:40:04 CET 2006
Author: glen Date: Mon Jan 2 08:40:04 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fix pkgconfig file, remove unneeded dbd .la files
- kill (now) unneccessary deps on -devel
---- Files affected:
SPECS:
apr-util.spec (1.38 -> 1.39)
---- Diffs:
================================================================
Index: SPECS/apr-util.spec
diff -u SPECS/apr-util.spec:1.38 SPECS/apr-util.spec:1.39
--- SPECS/apr-util.spec:1.38 Sun Jan 1 21:34:56 2006
+++ SPECS/apr-util.spec Mon Jan 2 09:39:59 2006
@@ -1,9 +1,4 @@
# $Revision$, $Date$
-# TODO
-# - play with DSO dbd's
-# - licensing issues with mysql. can we (PLD Linux) package it inside
-# apr-util? see INSTALL.MySQL for more details
-#
# Conditional build:
%bcond_without ldap # without LDAP support
%bcond_without mysql # with MySQL support
@@ -16,13 +11,13 @@
Summary(pl): Biblioteka towarzysząca Apache Portable Runtime
Name: apr-util
Version: 1.2.2
-Release: 1.20
+Release: 1.21
Epoch: 1
License: Apache v2.0
Group: Libraries
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
# Source0-md5: 694228b227e30cb9da3823514516e91c
-# http://apache.webthing.com/database/apr_dbd_mysql.c, our is modified
+# http://apache.webthing.com/database/apr_dbd_mysql.c
Source1: apr_dbd_mysql.c
Patch0: %{name}-link.patch
Patch1: %{name}-mysql.patch
@@ -96,11 +91,7 @@
Requires: db-devel
Requires: expat-devel
Requires: gdbm-devel
-%{?with_mysql:Requires: mysql-devel}
%{?with_ldap:Requires: openldap-devel}
-%{?with_pgsql:Requires: postgresql-devel}
-%{?with_sqlite2:Requires: sqlite-devel >= 2}
-%{?with_sqlite3:Requires: sqlite3-devel >= 3}
%description devel
Header files and development documentation for apr-util.
@@ -157,7 +148,8 @@
CC="%{__cc}"
%if %{with dso}
-%{__sed} -i -e 's,-l\(pq\|mysqlclient_r\|sqlite\|sqlite3\) ,,g' Makefile
+# ugly hack until they fix their build system to provide this
+%{__sed} -i -e 's,-l\(pq\|mysqlclient_r\|sqlite\|sqlite3\) ,,g' Makefile apr-util.pc
%{__sed} -i -e '/OBJECTS_all/s, dbd/apr_dbd_.*\.lo,,g' build-outputs.mk
rm -f libaprutil-1.la
%{__make} libaprutil-1.la
@@ -199,6 +191,7 @@
libtool --mode=install /usr/bin/install -c -m 755 dbd/libapr_dbd_sqlite3.la $RPM_BUILD_ROOT%{_libdir}
mv $RPM_BUILD_ROOT%{_libdir}/{lib,}apr_dbd_sqlite3.so
%endif
+rm -f $RPM_BUILD_ROOT%{_libdir}/libapr_dbd_*.la
%endif
%clean
@@ -258,6 +251,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.39 2006/01/02 08:39:59 glen
+- fix pkgconfig file, remove unneeded dbd .la files
+- kill (now) unneccessary deps on -devel
+
Revision 1.38 2006/01/01 20:34:56 glen
- subpackages for dbd drivers
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apr-util.spec?r1=1.38&r2=1.39&f=u
More information about the pld-cvs-commit
mailing list