packages: java-hamcrest11/java-hamcrest11.spec - unified

[qboosh]

Author: qboosh                       Date: Sat Feb 12 11:42:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified

---- Files affected:
packages/java-hamcrest11:
   java-hamcrest11.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/java-hamcrest11/java-hamcrest11.spec
diff -u packages/java-hamcrest11/java-hamcrest11.spec:1.3 packages/java-hamcrest11/java-hamcrest11.spec:1.4
--- packages/java-hamcrest11/java-hamcrest11.spec:1.3	Tue Apr 20 17:38:32 2010
+++ packages/java-hamcrest11/java-hamcrest11.spec	Sat Feb 12 12:42:07 2011
@@ -7,7 +7,7 @@
 # Conditional build:
 %bcond_without	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	binary		# do not compile .jars from source use bundled ones
 %bcond_with	bootstrap	# break BR loop (java-junit, java-qdox)
 
 %if %{with bootstrap}
@@ -75,16 +75,16 @@
 Dokumentacja javadoc do hamcresta.
 
 %package source
-Summary:	Source code of %{srcname}
-Summary(pl.UTF-8):	Kod źródłowy %{srcname}
+Summary:	Source code of hamcrest 1.1
+Summary(pl.UTF-8):	Kod źródłowy biblioteki hamcrest 1.1
 Group:		Documentation
 Requires:	jpackage-utils >= 1.7.5-2
 
 %description source
-Source code of %{srcname}.
+Source code of hamcrest 1.1.
 
 %description source -l pl.UTF-8
-Kod źródłowy %{srcname}.
+Kod źródłowy biblioteki hamcrest 1.1.
 
 %prep
 %setup -q -n hamcrest-%{version}
@@ -94,11 +94,11 @@
 %patch0 -p0
 %patch1 -p0
 
-rm -vf lib/integration/junit-*.jar
-rm -vf lib/generator/qdox-*.jar
+%{__rm} lib/integration/junit-*.jar
+%{__rm} lib/generator/qdox-*.jar
 
 %if %{without binary}
-rm -vf *.jar
+%{__rm} *.jar
 %endif
 
 # TODO: add new property (with this default value) do be override with -D
@@ -172,7 +172,14 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt LICENSE.txt README.txt
-%{_javadir}/*.jar
+%{_javadir}/hamcrest11-core-%{version}.jar
+%{_javadir}/hamcrest11-core.jar
+%{_javadir}/hamcrest11-generator-%{version}.jar
+%{_javadir}/hamcrest11-generator.jar
+%{_javadir}/hamcrest11-integration-%{version}.jar
+%{_javadir}/hamcrest11-integration.jar
+%{_javadir}/hamcrest11-library-%{version}.jar
+%{_javadir}/hamcrest11-library.jar
 
 %if %{with javadoc}
 %files javadoc
@@ -184,13 +191,16 @@
 %files source
 %defattr(644,root,root,755)
 %{_javasrcdir}/%{srcname}.src.jar
-%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/02/12 11:42:07  qboosh
+- unified
+
 Revision 1.3  2010/04/20 15:38:32  pawelz
 - one more %{srcname} fix
 - rel 2
@@ -202,4 +212,3 @@
 - hamcres-1.1 packaged as new spec, because it is not compatibile with
   hamcrest-1.2. For example java-junit uses some API that does not exist in
   1.2
-
================================================================

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