Author: qboosh Date: Sat Feb 12 11:59:26 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- unified
---- Files affected:
packages/java-hamcrest:
java-hamcrest.spec (1.19 -> 1.20)
---- Diffs:
================================================================
Index: packages/java-hamcrest/java-hamcrest.spec
diff -u packages/java-hamcrest/java-hamcrest.spec:1.19
packages/java-hamcrest/java-hamcrest.spec:1.20
--- packages/java-hamcrest/java-hamcrest.spec:1.19 Tue Apr 20 16:59:08 2010
+++ packages/java-hamcrest/java-hamcrest.spec Sat Feb 12 12:59:21 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}
@@ -69,27 +69,27 @@
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
+Summary(pl.UTF-8): Kod źródłowy biblioteki hamcrest
Group: Documentation
Requires: jpackage-utils >= 1.7.5-2
%description source
-Source code of %{srcname}.
+Source code of hamcrest.
%description source -l pl.UTF-8
-Kod źródłowy %{srcname}.
+Kod źródłowy biblioteki hamcrest.
%prep
%setup -q -n %{srcname}-%{version}
%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
@@ -163,7 +163,14 @@
%files
%defattr(644,root,root,755)
%doc CHANGES.txt LICENSE.txt README.txt
-%{_javadir}/*.jar
+%{_javadir}/hamcrest-core-%{version}.jar
+%{_javadir}/hamcrest-core.jar
+%{_javadir}/hamcrest-generator-%{version}.jar
+%{_javadir}/hamcrest-generator.jar
+%{_javadir}/hamcrest-integration-%{version}.jar
+%{_javadir}/hamcrest-integration.jar
+%{_javadir}/hamcrest-library-%{version}.jar
+%{_javadir}/hamcrest-library.jar
%if %{with javadoc}
%files javadoc
@@ -175,13 +182,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 <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2011/02/12 11:59:21 qboosh
+- unified
+
Revision 1.19 2010/04/20 14:59:08 pawelz
- fixed jpackage-utils dep
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-hamcrest/java-hamcrest.spec?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
