Author: arekm Date: Mon Jan 2 09:00:15 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel 2; DSOs with DBD backends
---- Files affected:
SPECS:
apr-util.spec (1.40 -> 1.41)
---- Diffs:
================================================================
Index: SPECS/apr-util.spec
diff -u SPECS/apr-util.spec:1.40 SPECS/apr-util.spec:1.41
--- SPECS/apr-util.spec:1.40 Mon Jan 2 09:54:22 2006
+++ SPECS/apr-util.spec Mon Jan 2 10:00:09 2006
@@ -11,7 +11,7 @@
Summary(pl): Biblioteka towarzysząca Apache Portable Runtime
Name: apr-util
Version: 1.2.2
-Release: 1.23
+Release: 2
Epoch: 1
License: Apache v2.0
Group: Libraries
@@ -23,6 +23,7 @@
Patch1: %{name}-mysql.patch
Patch2: %{name}-db4.4.patch
Patch3: %{name}-dso.patch
+Patch4: %{name}-dbd.patch
URL: http://apr.apache.org/
BuildRequires: apr-devel >= 1:1.1.0
%{?with_mysql:BuildRequires: apr-devel >= 1:1.2.2-2.6}
@@ -123,7 +124,10 @@
# (and it shouldn't: apr-devel should have it -glen)
%{__sed} -i -e 's/^\(.*gen-build\.py\)/#\1/' buildconf
%endif
-%{?with_dso:%patch3 -p1}
+%if %{with dso}
+%patch3 -p1
+%patch4 -p1
+%endif
rm -rf xml/expat
@@ -148,8 +152,6 @@
CC="%{__cc}"
%if %{with dso}
-# 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 apu-1-config
%{__sed} -i -e '/OBJECTS_all/s, dbd/apr_dbd_.*\.lo,,g' build-outputs.mk
rm -f libaprutil-1.la
%{__make} libaprutil-1.la
@@ -251,6 +253,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2006/01/02 09:00:09 arekm
+- rel 2; DSOs with DBD backends
+
Revision 1.40 2006/01/02 08:54:22 glen
- remove db libs also from apu-1-config
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apr-util.spec?r1=1.40&r2=1.41&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
