packages: java-jdom/java-jdom.spec - don't force specific jdk - tabs in sub...

[pawelz]

Author: pawelz                       Date: Sun Apr 18 15:00:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk
- tabs in subpackage preamble

---- Files affected:
packages/java-jdom:
   java-jdom.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/java-jdom/java-jdom.spec
diff -u packages/java-jdom/java-jdom.spec:1.5 packages/java-jdom/java-jdom.spec:1.6
--- packages/java-jdom/java-jdom.spec:1.5	Tue Mar 31 21:52:51 2009
+++ packages/java-jdom/java-jdom.spec	Sun Apr 18 17:00:37 2010
@@ -1,13 +1,5 @@
 # $Revision$, $Date$
 #
-# 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
-#
 %define		srcname	jdom
 #
 %include	/usr/lib/rpm/macros.java
@@ -22,10 +14,8 @@
 # Source0-md5:	22745cbaaddb12884ed8ee09083d8fe2
 URL:		http://www.jdom.org/
 BuildRequires:	ant
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
@@ -65,10 +55,10 @@
 Pliki demonstracyjne i przykłady dla pakietu %{srcname}.
 
 %package javadoc
-Summary:        %{srcname} documentation
-Summary(pl.UTF-8):      Dokumentacja do %{srcname}
-Group:          Documentation
-Requires:       jpackage-utils
+Summary:	%{srcname} documentation
+Summary(pl.UTF-8):	Dokumentacja do %{srcname}
+Group:		Documentation
+Requires:	jpackage-utils
 
 %description javadoc
 %{srcname} documentation.
@@ -128,6 +118,10 @@
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 $Log$
+Revision 1.6  2010/04/18 15:00:37  pawelz
+- don't force specific jdk
+- tabs in subpackage preamble
+
 Revision 1.5  2009/03/31 19:52:51  pawelz
 - rel 2
 
================================================================

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