Author: pawelz Date: Fri Apr 23 00:01:58 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/db4.8:
db4.8.spec (1.4 -> 1.5)
packages/ice:
ice.spec (1.24 -> 1.25)
---- Diffs:
================================================================
Index: packages/db4.8/db4.8.spec
diff -u packages/db4.8/db4.8.spec:1.4 packages/db4.8/db4.8.spec:1.5
--- packages/db4.8/db4.8.spec:1.4 Thu Feb 11 00:10:26 2010
+++ packages/db4.8/db4.8.spec Fri Apr 23 02:01:49 2010
@@ -5,12 +5,6 @@
%bcond_without tcl # don't build Tcl bindings
%bcond_without static_libs # don't build static libraries
-%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.8
@@ -30,9 +24,7 @@
URL: http://www.oracle.com/technology/products/berkeley-db/index.html
BuildRequires: automake
%if %{with java}
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
-BuildRequires: rpm >= 4.4.9-56
+BuildRequires: jdk
BuildRequires: rpm-javaprov
%endif
BuildRequires: libstdc++-devel
@@ -512,6 +504,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2010/04/23 00:01:49 pawelz
+- Don't force specific jdk.
+
Revision 1.4 2010/02/10 23:10:26 sparky
- dropped BR: ed
================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.24 packages/ice/ice.spec:1.25
--- packages/ice/ice.spec:1.24 Wed Apr 7 12:21:22 2010
+++ packages/ice/ice.spec Fri Apr 23 02:01:53 2010
@@ -10,12 +10,6 @@
%bcond_without python # Python bindings
%bcond_without ruby # Ruby bindings
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
-
%if %{without java}
%undefine with_gui
%endif
@@ -47,7 +41,6 @@
BuildRequires: expat-devel
BuildRequires: mcpp-devel
BuildRequires: openssl-devel
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.533
%if %{with gui}
BuildRequires: ImageMagick
@@ -59,10 +52,9 @@
%if %{with java}
BuildRequires: ant-nodeps
BuildRequires: db-java-devel
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
BuildRequires: java-jgoodies-forms
BuildRequires: java-jgoodies-looks
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
%endif
@@ -646,6 +638,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2010/04/23 00:01:53 pawelz
+- Don't force specific jdk.
+
Revision 1.24 2010/04/07 10:21:22 shadzik
- make -j1 - builds that way for sure on all archs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.8/db4.8.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.24&r2=1.25&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
