Author: pawelz Date: Fri Apr 23 00:03:26 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-joda-time:
java-joda-time.spec (1.3 -> 1.4)
packages/java-log4j:
java-log4j.spec (1.57 -> 1.58)
---- Diffs:
================================================================
Index: packages/java-joda-time/java-joda-time.spec
diff -u packages/java-joda-time/java-joda-time.spec:1.3
packages/java-joda-time/java-joda-time.spec:1.4
--- packages/java-joda-time/java-joda-time.spec:1.3 Thu Apr 15 01:32:28 2010
+++ packages/java-joda-time/java-joda-time.spec Fri Apr 23 02:03:17 2010
@@ -6,12 +6,6 @@
%bcond_without javadoc # don't build javadoc
%bcond_without source # don't build source jar
-%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 srcname joda-time
@@ -25,12 +19,10 @@
# Source0-md5: 8e59de208eb994010575e34179f2b580
URL: http://joda-time.sourceforge.net/
BuildRequires: ant
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
# NOT only for tests. If not present ant will try to download it.
BuildRequires: java-junit
BuildRequires: jpackage-utils >= 1.7.5-2
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.555
# for %{_javadir}
@@ -138,6 +130,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2010/04/23 00:03:17 pawelz
+- Don't force specific jdk.
+
Revision 1.3 2010/04/14 23:32:28 pawelz
- source subpackage
================================================================
Index: packages/java-log4j/java-log4j.spec
diff -u packages/java-log4j/java-log4j.spec:1.57
packages/java-log4j/java-log4j.spec:1.58
--- packages/java-log4j/java-log4j.spec:1.57 Sun Apr 18 17:15:25 2010
+++ packages/java-log4j/java-log4j.spec Fri Apr 23 02:03:21 2010
@@ -37,7 +37,7 @@
BuildRequires: java(javamail) >= 1.2
BuildRequires: java(jaxp_parser_impl)
%{?with_jmx:BuildRequires: java(jmx) >= 1.2.1}
-BuildRequires: java-sun
+BuildRequires: jdk
%{?with_jms:BuildRequires: jms >= 1.1}
%{?with_jmx:BuildRequires: jmx-tools >= 1.2.1}
%{?with_jmx:BuildRequires: java(jndi)}
@@ -141,6 +141,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.58 2010/04/23 00:03:21 pawelz
+- Don't force specific jdk.
+
Revision 1.57 2010/04/18 15:15:25 pawelz
- don't force specific jdk
- dropped P: logging-log4j
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-joda-time/java-joda-time.spec?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-log4j/java-log4j.spec?r1=1.57&r2=1.58&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
