packages: java-slf4j/java-slf4j.spec, javassist/javassist.spec - Don't forc...

[pawelz]

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

---- Files affected:
packages/java-slf4j:
   java-slf4j.spec (1.3 -> 1.4) 
packages/javassist:
   javassist.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/java-slf4j/java-slf4j.spec
diff -u packages/java-slf4j/java-slf4j.spec:1.3 packages/java-slf4j/java-slf4j.spec:1.4
--- packages/java-slf4j/java-slf4j.spec:1.3	Tue Sep 22 00:26:09 2009
+++ packages/java-slf4j/java-slf4j.spec	Fri Apr 23 02:03:41 2010
@@ -4,12 +4,6 @@
 # - tests?
 # - split into subpackages?
 
-%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		slf4j
@@ -25,12 +19,10 @@
 URL:		http://www.slf4j.org/
 BuildRequires:	java-commons-lang
 BuildRequires:	java-commons-logging
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
 BuildRequires:	java-log4j
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	javassist
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
@@ -94,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/04/23 00:03:41  pawelz
+- Don't force specific jdk.
+
 Revision 1.3  2009/09/21 22:26:09  pawelz
 - adapterized
 

================================================================
Index: packages/javassist/javassist.spec
diff -u packages/javassist/javassist.spec:1.5 packages/javassist/javassist.spec:1.6
--- packages/javassist/javassist.spec:1.5	Tue Sep 22 00:59:10 2009
+++ packages/javassist/javassist.spec	Fri Apr 23 02:03:45 2010
@@ -4,12 +4,6 @@
 # - it doesn't build with gcj, because it requires com.sun.jdi. Is there any
 #   non-sun package that provides these classes?
 
-%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
 Summary:	Java Programming Assistant: bytecode manipulation
 Summary(pl.UTF-8):	Asystent programisty Javy: operacje na bajtkodzie
@@ -22,10 +16,8 @@
 # Source0-md5:	3afecb69a0c167a978c93f7074a74dfc
 URL:		http://www.csg.is.titech.ac.jp/~chiba/javassist/
 BuildRequires:	ant >= 0:1.6
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils >= 0:1.6
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildArch:	noarch
@@ -150,6 +142,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/04/23 00:03:45  pawelz
+- Don't force specific jdk.
+
 Revision 1.5  2009/09/21 22:59:10  pawelz
 - G: Libraries/java
 - TODO
================================================================

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