packages: java-hamcrest/java-hamcrest.spec - up to 1.2 - use our new cool %...

[pawelz]

Author: pawelz                       Date: Mon Apr 19 20:10:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.2
- use our new cool %bootstrap_release macro
- disable tests. They don't build. It is problem with tests, not with tested code

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

---- Diffs:

================================================================
Index: packages/java-hamcrest/java-hamcrest.spec
diff -u packages/java-hamcrest/java-hamcrest.spec:1.15 packages/java-hamcrest/java-hamcrest.spec:1.16
--- packages/java-hamcrest/java-hamcrest.spec:1.15	Sun Apr 18 16:47:27 2010
+++ packages/java-hamcrest/java-hamcrest.spec	Mon Apr 19 22:10:40 2010
@@ -5,9 +5,9 @@
 # - does not build with gcj.
 #
 # Conditional build:
-%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	javadoc		# build javadoc
+%bcond_with	tests		# build and run tests (tests are broken)
+%bcond_with binary		# do not compile .jars from source use bundled ones
 %bcond_with	bootstrap	# break BR loop (java-junit, java-qdox)
 
 %if %{with bootstrap}
@@ -16,19 +16,18 @@
 %undefine	with_javadoc
 %endif
 
+%define		rel	1
 %define		srcname	hamcrest
 %include	/usr/lib/rpm/macros.java
 Summary:	Hamcrest - a library of matchers
 Summary(pl.UTF-8):	Hamcrest - biblioteka klas dopasowujących
 Name:		java-hamcrest
-Version:	1.1
-Release:	3
+Version:	1.2
+Release:	%{bootstrap_release %rel}
 License:	BSD
 Group:		Libraries/Java
 Source0:	http://hamcrest.googlecode.com/files/%{srcname}-%{version}.tgz
-# Source0-md5:	1bd4fd301c1a0dc748082378a59cb281
-Source1:	http://hamcrest.googlecode.com/files/%{srcname}-text-%{version}.jar
-# Source1-md5:	6267206d906192119a8e9770f7e2ed65
+# Source0-md5:	b4bd43f44d082d77daf7ec564d304cdf
 Patch0:		%{srcname}-nosrc.patch
 URL:		http://code.google.com/p/hamcrest/
 %if %{without binary}
@@ -40,7 +39,7 @@
 %endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.557
 Requires:	java-qdox
 Requires:	jpackage-utils
 BuildArch:	noarch
@@ -68,15 +67,12 @@
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1
+%patch0 -p0
 
 rm -vf lib/integration/junit-*.jar
 rm -vf lib/generator/qdox-*.jar
 
-%if %{with binary}
-# hamcrest-text somewhy missing in jar
-cp -a %{SOURCE1} .
-%else
+%if %{without binary}
 rm -vf *.jar
 %endif
 
@@ -97,7 +93,7 @@
 qdox.jar=$qdox_jar
 EOF
 
-%ant core generator library text integration \
+%ant core generator library integration \
 	-Dqdox.jar=$qdox_jar \
 	-Dversion=%{version}
 %endif
@@ -119,7 +115,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
-for f in core generator integration library text; do
+for f in core generator integration library; do
 	cp -a build/hamcrest-$f-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
 	ln -sf hamcrest-$f-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/hamcrest-$f.jar
 done
@@ -155,6 +151,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/04/19 20:10:40  pawelz
+- up to 1.2
+- use our new cool %bootstrap_release macro
+- disable tests. They don't build. It is problem with tests, not with tested code
+
 Revision 1.15  2010/04/18 14:47:27  pawelz
 - don't add .bootstrap to rel. x.bootstrap > x.
 - don't force specific jdk
================================================================

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