Author: pawelz Date: Fri Jun 12 09:36:42 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- source,target = 1.5 (it now builds with gcj)
- added jdk bconds
- rel 2
---- Files affected:
packages/db4.7:
db4.7.spec (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/db4.7/db4.7.spec
diff -u packages/db4.7/db4.7.spec:1.16 packages/db4.7/db4.7.spec:1.17
--- packages/db4.7/db4.7.spec:1.16 Thu Jun 4 22:43:20 2009
+++ packages/db4.7/db4.7.spec Fri Jun 12 11:36:36 2009
@@ -9,6 +9,14 @@
%undefine with_java
%endif
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
+
+%include /usr/lib/rpm/macros.java
+
%define libver 4.7
%define ver %{libver}.25
%define patchlevel 4
@@ -16,7 +24,7 @@
Summary(pl.UTF-8): Biblioteka C do obsługi baz Berkeley DB
Name: db4.7
Version: %{ver}.%{patchlevel}
-Release: 1
+Release: 2
Epoch: 0
License: GPL-like (see LICENSE)
Group: Libraries
@@ -26,7 +34,12 @@
URL: http://www.oracle.com/technology/products/berkeley-db/index.html
BuildRequires: automake
BuildRequires: ed
-%{?with_java:BuildRequires: jdk}
+%if %{with java}
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpm-javaprov
+%endif
BuildRequires: libstdc++-devel
BuildRequires: rpmbuild(macros) >= 1.426
BuildRequires: sed >= 4.0
@@ -251,6 +264,9 @@
%build
cp -f /usr/share/automake/config.sub dist
+JAVACFLAGS="-source 1.5 -target 1.5"
+export JAVACFLAGS
+
%if %{with static_libs}
cp -a build_unix build_unix.static
@@ -261,6 +277,7 @@
CFLAGS="%{rpmcflags}"
CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
LDFLAGS="%{rpmcflags} %{rpmldflags}"
+
export CC CXX CFLAGS CXXFLAGS LDFLAGS
../dist/%configure \
@@ -493,6 +510,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2009/06/12 09:36:36 pawelz
+- source,target = 1.5 (it now builds with gcj)
+- added jdk bconds
+- rel 2
+
Revision 1.16 2009/06/04 20:43:20 glen
- update to 4.7.25.4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.7/db4.7.spec?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
