packages: java-hamcrest/java-hamcrest.spec - don't add .bootstrap to rel. x...

[pawelz]

Author: pawelz                       Date: Sun Apr 18 14:47:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't add .bootstrap to rel. x.bootstrap > x.
- don't force specific jdk
- sorted BRs

---- Files affected:
packages/java-hamcrest:
   java-hamcrest.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/java-hamcrest/java-hamcrest.spec
diff -u packages/java-hamcrest/java-hamcrest.spec:1.14 packages/java-hamcrest/java-hamcrest.spec:1.15
--- packages/java-hamcrest/java-hamcrest.spec:1.14	Thu Aug 20 13:22:24 2009
+++ packages/java-hamcrest/java-hamcrest.spec	Sun Apr 18 16:47:27 2010
@@ -10,12 +10,6 @@
 %bcond_with 	binary		# do not compile .jars from source use bundled ones
 %bcond_with	bootstrap	# break BR loop (java-junit, java-qdox)
 
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
-%bcond_without	java_sun	# build with java-sun
-%endif
-
 %if %{with bootstrap}
 %define		with_binary	1
 %undefine	with_tests
@@ -28,7 +22,7 @@
 Summary(pl.UTF-8):	Hamcrest - biblioteka klas dopasowujących
 Name:		java-hamcrest
 Version:	1.1
-Release:	3%{?with_bootstrap:.bootstrap}
+Release:	3
 License:	BSD
 Group:		Libraries/Java
 Source0:	http://hamcrest.googlecode.com/files/%{srcname}-%{version}.tgz
@@ -38,19 +32,17 @@
 Patch0:		%{srcname}-nosrc.patch
 URL:		http://code.google.com/p/hamcrest/
 %if %{without binary}
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun >= 1.5}
 BuildRequires:	ant >= 1.6
 %{?with_tests:BuildRequires:	ant-junit >= 1.6}
 %{?with_tests:BuildRequires:	java-junit}
 BuildRequires:	java-qdox
+BuildRequires:	jdk
 %endif
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	jpackage-utils
 Requires:	java-qdox
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -163,6 +155,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/04/18 14:47:27  pawelz
+- don't add .bootstrap to rel. x.bootstrap > x.
+- don't force specific jdk
+- sorted BRs
+
 Revision 1.14  2009/08/20 11:22:24  pawelz
 - rel 3
 
================================================================

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