Author: pawelz Date: Mon Apr 13 14:24:57 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - renamed from hamcrest - BR: java-sun when being built with java_sun - '#' is not a comment in spec file
---- Files affected: SPECS: java-hamcrest.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/java-hamcrest.spec diff -u SPECS/java-hamcrest.spec:1.2 SPECS/java-hamcrest.spec:1.3 --- SPECS/java-hamcrest.spec:1.2 Fri Apr 3 17:53:56 2009 +++ SPECS/java-hamcrest.spec Mon Apr 13 16:24:51 2009 @@ -13,21 +13,24 @@ %endif # %include /usr/lib/rpm/macros.java + +%srcname hamcrest Summary: Hamcrest - a library of matchers Summary(pl.UTF-8): Hamcrest - biblioteka klas dopasowujących -Name: hamcrest +Name: java-hamcrest Version: 1.1 Release: 0.1 License: BSD Group: Development/Languages/Java -Source0: http://hamcrest.googlecode.com/files/%{name}-%{version}.tgz +Source0: http://hamcrest.googlecode.com/files/%{srcname}-%{version}.tgz # Source0-md5: 1bd4fd301c1a0dc748082378a59cb281 -Patch0: %{name}-nosrc.patch -Patch1: %{name}-target.patch +Patch0: %{srcname}-nosrc.patch +Patch1: %{srcname}-target.patch URL: http://code.google.com/p/hamcrest/ BuildRequires: ant >= 1.6 %{?with_tests:BuildRequires: ant-junit >= 1.6} %{!?with_java_sun:BuildRequires: java-gcj-compat-devel} +%{?with_java_sun:BuildRequires: java-sun} %{?with_tests:BuildRequires: java-junit} BuildRequires: java-qdox %{?with_java_sun:BuildRequires: java-sun >= 1.5} @@ -75,9 +78,11 @@ %ant bigjar \ -Dversion=%{version} +%if 0 # doesn't build -#%ant javadoc \ -# -Dversion=%{version} +%ant javadoc \ + -Dversion=%{version} +%endif %if %{with tests} %ant unit-test \ @@ -93,16 +98,18 @@ ln -sf hamcrest-${f}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/hamcrest-${f}.jar done +%if 0 # javadoc -#install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -#cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -#ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink +%endif %clean rm -rf $RPM_BUILD_ROOT %post javadoc -ln -nfs %{name}-%{version} %{_javadocdir}/%{name} +ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname} %files %defattr(644,root,root,755) @@ -114,10 +121,12 @@ %{_javadir}/hamcrest-library*.jar %{_javadir}/hamcrest-text*.jar -#%files javadoc -#%defattr(644,root,root,755) -#%{_javadocdir}/%{name}-%{version} -#%ghost %{_javadocdir}/%{name} +%if 0 +%files javadoc +%defattr(644,root,root,755) +%{_javadocdir}/%{srcname}-%{version} +%ghost %{_javadocdir}/%{srcname} +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -125,6 +134,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2009/04/13 14:24:51 pawelz +- renamed from hamcrest +- BR: java-sun when being built with java_sun +- '#' is not a comment in spec file + Revision 1.2 2009/04/03 15:53:56 pawelz - jdk bconds - dropped EA ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-hamcrest.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
