SPECS: java-hamcrest.spec - do a clean build - don't package -all.jar

[glen]

Author: glen                         Date: Mon Apr 13 16:44:29 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- do a clean build
- don't package -all.jar

---- Files affected:
SPECS:
   java-hamcrest.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/java-hamcrest.spec
diff -u SPECS/java-hamcrest.spec:1.6 SPECS/java-hamcrest.spec:1.7
--- SPECS/java-hamcrest.spec:1.6	Mon Apr 13 16:52:49 2009
+++ SPECS/java-hamcrest.spec	Mon Apr 13 18:44:24 2009
@@ -66,14 +66,24 @@
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1
 
-rm -f lib/integration/junit*
+rm -vf *.jar
+rm -vf lib/integration/junit-*.jar
+rm -vf lib/generator/qdox-*.jar
+
+# TODO: add new property (with this default value) do be override with -D
+# TODO: add build.properties support to build.xml
+%{__sed} -i -e 's,lib/generator/qdox-1.6.1.jar,${qdox.jar},g' build.xml
 
 %build
 export JAVA_HOME="%{java_home}"
 
 CLASSPATH=$(find-jar qdox)
+cat <<EOF > build.properties
+qdox.jar=$(find-jar qdox)
+EOF
 
-%ant bigjar \
+%ant core generator library text integration \
+	-Dqdox.jar=$(find-jar qdox) \
 	-Dversion=%{version}
 
 %if 0
@@ -91,9 +101,9 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
-for f in all core generator integration library text ; do
-	install build/hamcrest-${f}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-	ln -sf hamcrest-${f}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/hamcrest-${f}.jar
+for f in core generator integration library text; 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
 
 %if 0
@@ -112,12 +122,7 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt LICENSE.txt README.txt
-%{_javadir}/hamcrest-all*.jar
-%{_javadir}/hamcrest-core*.jar
-%{_javadir}/hamcrest-generator*.jar
-%{_javadir}/hamcrest-integration*.jar
-%{_javadir}/hamcrest-library*.jar
-%{_javadir}/hamcrest-text*.jar
+%{_javadir}/*.jar
 
 %if 0
 %files javadoc
@@ -132,12 +137,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2009/04/13 16:44:24  glen
+- do a clean build
+- don't package -all.jar
+
 Revision 1.6  2009/04/13 14:52:49  pawelz
 - added TODO (does not build with gcj)
 - dropped patch1
 
 Revision 1.5  2009/04/13 14:41:50  pawelz
-- fixed %%setup
+- fixed %setup
 
 Revision 1.4  2009/04/13 14:30:37  pawelz
 - typo (define srcname)
================================================================

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