packages: java-hamcrest11/java-hamcrest11.spec - fix %{name}/%{srcname}

[pawelz]

Author: pawelz                       Date: Tue Apr 20 15:25:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix %{name}/%{srcname}

---- Files affected:
packages/java-hamcrest11:
   java-hamcrest11.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-hamcrest11/java-hamcrest11.spec
diff -u packages/java-hamcrest11/java-hamcrest11.spec:1.1 packages/java-hamcrest11/java-hamcrest11.spec:1.2
--- packages/java-hamcrest11/java-hamcrest11.spec:1.1	Tue Apr 20 17:14:31 2010
+++ packages/java-hamcrest11/java-hamcrest11.spec	Tue Apr 20 17:25:34 2010
@@ -17,18 +17,18 @@
 %endif
 
 %define		rel	1
-%define		srcname	hamcrest
+%define		srcname	hamcrest11
 %include	/usr/lib/rpm/macros.java
 Summary:	Hamcrest - a library of matchers
 Summary(pl.UTF-8):	Hamcrest - biblioteka klas dopasowujących
-Name:		java-hamcrest
+Name:		java-hamcrest11
 Version:	1.1
 Release:	%{bootstrap_release %rel}
 License:	BSD
 Group:		Libraries/Java
-Source0:	http://hamcrest.googlecode.com/files/%{srcname}-%{version}.tgz
+Source0:	http://hamcrest.googlecode.com/files/hamcrest-%{version}.tgz
 # Source0-md5:	1bd4fd301c1a0dc748082378a59cb281
-Patch0:		%{srcname}-nosrc.patch
+Patch0:		hamcrest-nosrc.patch
 Patch1:		javadoc-build.patch
 URL:		http://code.google.com/p/hamcrest/
 %if %{without binary}
@@ -51,10 +51,16 @@
 Hamcrest is a library of matchers, which can be combined in to create
 flexible expressions of intent in tests.
 
+This package contains hamcrest v. 1.1. For the newest release see
+java-hamcrest package.
+
 %description -l pl.UTF-8
 Hamcrest to biblioteka klas dopasowujących, które można łączyć w celu
 utworzenia elastycznych wyrażeń do wykorzystania w testach.
 
+Ten pakiet zawiera wersję 1.1 biblioteki hamcrest. Najnowsze wydanie
+biblioteki można znaleźć w pakiecie java-hamcrest.
+
 %package javadoc
 Summary:	Javadoc manual for hamcrest
 Summary(pl.UTF-8):	Dokumentacja javadoc do hamcresta
@@ -81,7 +87,7 @@
 Kod źródłowy %{srcname}.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n hamcrest-%{version}
 
 %undos build.xml
 
@@ -142,8 +148,8 @@
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 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
+	cp -a build/hamcrest-$f-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-$f-%{version}.jar
+	ln -sf hamcrest-$f-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-$f.jar
 done
 
 %if %{with javadoc}
@@ -185,6 +191,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/04/20 15:25:34  pawelz
+- fix %{name}/%{srcname}
+
 Revision 1.1  2010/04/20 15:14:31  pawelz
 - 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
================================================================

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