Author: pawelz Date: Sun Apr 4 21:18:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- unified java part (distro-specific jdk bconds, force gcj on th)
- rpm-build-macros BR bumped to 1.533 because of %undos
- include java rpm macros (how to include them conditionally, only with java?)
---- Files affected:
packages/ice:
ice.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.14 packages/ice/ice.spec:1.15
--- packages/ice/ice.spec:1.14 Sun Apr 4 20:23:43 2010
+++ packages/ice/ice.spec Sun Apr 4 23:18:46 2010
@@ -10,10 +10,18 @@
%bcond_without php # PHP bindings
%bcond_without gui # IceGrid GUI
+%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
+%include /usr/lib/rpm/macros.java
+
Summary: The Ice base runtime and services
Name: ice
Version: 3.4.0
@@ -36,15 +44,23 @@
Patch2: java-build.patch
Patch3: jgoodies.patch
%{?with_gui:BuildRequires: ImageMagick}
-%{?with_java:BuildRequires: ant-nodeps}
BuildRequires: db-cxx-devel
-%{?with_java:BuildRequires: db-java-devel}
-%{?with_java:BuildRequires: java-jgoodies-forms}
-%{?with_java:BuildRequires: java-jgoodies-looks}
+%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: jpackage-utils
+BuildRequires: rpm >= 4.4.9-56
+%endif
+# It is not possible to %%include conditionally, so BR: rpm-javaprov always
+BuildRequires: rpm-javaprov
BuildRequires: mcpp-devel
%{?with_php:BuildRequires: php-devel >= 3:5.0.0}
%{?with_python:BuildRequires: rpm-pythonprov}
-BuildRequires: rpmbuild(macros) >= 1.519
+BuildRequires: rpmbuild(macros) >= 1.533
%{?with_ruby:BuildRequires: ruby >= 1:1.8.6}
# Ice doesn't officially support ppc64 at all; sparc64 doesnt have mono
ExcludeArch: ppc64 sparc64
@@ -605,6 +621,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2010/04/04 21:18:46 pawelz
+- unified java part (distro-specific jdk bconds, force gcj on th)
+- rpm-build-macros BR bumped to 1.533 because of %undos
+- include java rpm macros (how to include them conditionally, only with java?)
+
Revision 1.14 2010/04/04 18:23:43 glen
- fix files move order, all seems bueno from here
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
