Author: pawelz                       Date: Fri Apr 23 00:03:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Don't force specific jdk.

---- Files affected:
packages/java-jessie:
   java-jessie.spec (1.3 -> 1.4) 
packages/java-jfreechart:
   java-jfreechart.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/java-jessie/java-jessie.spec
diff -u packages/java-jessie/java-jessie.spec:1.3 
packages/java-jessie/java-jessie.spec:1.4
--- packages/java-jessie/java-jessie.spec:1.3   Sun Apr 18 17:03:18 2010
+++ packages/java-jessie/java-jessie.spec       Fri Apr 23 02:03:01 2010
@@ -24,7 +24,7 @@
 BuildRequires: ant
 BuildRequires: java-gnu-classpath
 BuildRequires: java-gnu-crypto >= 2.0.1
-BuildRequires: java-sun
+BuildRequires: jdk
 BuildRequires: jpackage-utils >= 0:1.6
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
@@ -77,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/04/23 00:03:01  pawelz
+- Don't force specific jdk.
+
 Revision 1.3  2010/04/18 15:03:18  pawelz
 - don't force specific jdk
 - updated Provides

================================================================
Index: packages/java-jfreechart/java-jfreechart.spec
diff -u packages/java-jfreechart/java-jfreechart.spec:1.6 
packages/java-jfreechart/java-jfreechart.spec:1.7
--- packages/java-jfreechart/java-jfreechart.spec:1.6   Wed Apr  7 18:42:31 2010
+++ packages/java-jfreechart/java-jfreechart.spec       Fri Apr 23 02:03:05 2010
@@ -6,12 +6,6 @@
 # Conditional build:
 %bcond_without javadoc         # don't build javadoc
 
-%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         jfreechart
@@ -26,14 +20,12 @@
 # Source0-md5: 4967a55ef939ae60a18cd865e846f4cc
 URL:           http://www.jfree.org/jfreechart/
 BuildRequires: ant
-%{!?with_java_sun:BuildRequires:       java-gcj-compat-devel}
 BuildRequires: java-jcommon
 BuildRequires: java-junit
 BuildRequires: java-servletapi
-%{?with_java_sun:BuildRequires:        java-sun}
+BuildRequires: jdk
 BuildRequires: java-xml-commons
 BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 Requires:      java-jcommon
@@ -143,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/04/23 00:03:05  pawelz
+- Don't force specific jdk.
+
 Revision 1.6  2010/04/07 16:42:31  pawelz
 - TODO: build/package experimental classes
 - rel 1
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jessie/java-jessie.spec?r1=1.3&r2=1.4&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jfreechart/java-jfreechart.spec?r1=1.6&r2=1.7&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to