packages: java-pluto/java-pluto.spec - don't force specific jdk - updated P...

[pawelz]

Author: pawelz                       Date: Sun Apr 18 15:32:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk
- updated Provides
- use tabs

---- Files affected:
packages/java-pluto:
   java-pluto.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/java-pluto/java-pluto.spec
diff -u packages/java-pluto/java-pluto.spec:1.10 packages/java-pluto/java-pluto.spec:1.11
--- packages/java-pluto/java-pluto.spec:1.10	Fri Aug 21 09:32:14 2009
+++ packages/java-pluto/java-pluto.spec	Sun Apr 18 17:32:45 2010
@@ -4,12 +4,6 @@
 %bcond_without	javadoc		# don't build javadoc
 %bcond_with	java_sun	# build using java-sun
 
-%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		apiver	1.0
@@ -24,14 +18,12 @@
 # Source0-md5:	d6355e173ebda88b4a2da4f7df688875
 URL:		http://portals.apache.org/pluto/
 BuildRequires:	ant
-%{?with_java_sun:BuildRequires:	java-sun}
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
-Provides:	java(Portlet) = %{apiver}
+Provides:	java(portlet) = %{apiver}
 Obsoletes:	java-portletapi10
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,8 +50,8 @@
 
 cd api
 %ant \
-    -Dbuild.sysclasspath=only \
-    jar
+	-Dbuild.sysclasspath=only \
+	jar
 
 %{?with_javadoc:%ant -Dnoget=1 javadoc}
 cd ..
@@ -105,6 +97,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/04/18 15:32:45  pawelz
+- don't force specific jdk
+- updated Provides
+- use tabs
+
 Revision 1.10  2009/08/21 07:32:14  pawelz
 - added portlet-api.jar symlink
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-pluto/java-pluto.spec?r1=1.10&r2=1.11&f=u