packages: java-hamcrest/java-hamcrest.spec - drop hack for archs where java...

pawelz pawelz at pld-linux.org
Wed Aug 19 14:20:12 CEST 2009


Author: pawelz                       Date: Wed Aug 19 12:20:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop hack for archs where java-sun is not available
- bootstrap bcond

---- Files affected:
packages/java-hamcrest:
   java-hamcrest.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/java-hamcrest/java-hamcrest.spec
diff -u packages/java-hamcrest/java-hamcrest.spec:1.9 packages/java-hamcrest/java-hamcrest.spec:1.10
--- packages/java-hamcrest/java-hamcrest.spec:1.9	Thu May 21 19:23:29 2009
+++ packages/java-hamcrest/java-hamcrest.spec	Wed Aug 19 14:20:07 2009
@@ -8,16 +8,16 @@
 %bcond_with	javadoc		# don't build javadoc
 %bcond_without	tests		# don't build and run tests
 %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
 
-# HACK: use binary where java-sun not available
-%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
-%define	with_binary	1
+%if %{with bootstrap}
+%define		with_binary	1
 %endif
 
 %define		srcname	hamcrest
@@ -26,7 +26,7 @@
 Summary(pl.UTF-8):	Hamcrest - biblioteka klas dopasowujących
 Name:		java-hamcrest
 Version:	1.1
-Release:	2
+Release:	2%{?with_bootstrap:.bootstrap}
 License:	BSD
 Group:		Libraries/Java
 Source0:	http://hamcrest.googlecode.com/files/%{srcname}-%{version}.tgz
@@ -161,6 +161,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/08/19 12:20:07  pawelz
+- drop hack for archs where java-sun is not available
+- bootstrap bcond
+
 Revision 1.9  2009/05/21 17:23:29  glen
 - when using java_sun, use binary jars where java-sun is not available; rel 2
 
================================================================

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



More information about the pld-cvs-commit mailing list