Author: pawelz Date: Mon Feb 16 08:19:28 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - use java-gcj-compat-devel - correct dir for javadoc - rel 3
---- Files affected: SPECS: java-commons-digester.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/java-commons-digester.spec diff -u SPECS/java-commons-digester.spec:1.23 SPECS/java-commons-digester.spec:1.24 --- SPECS/java-commons-digester.spec:1.23 Thu Dec 25 21:45:10 2008 +++ SPECS/java-commons-digester.spec Mon Feb 16 09:19:22 2009 @@ -4,11 +4,13 @@ %bcond_without javadoc # don't build javadoc %include /usr/lib/rpm/macros.java + +%define srcname commmons-digester Summary: Commons Digester - XML to Java object mapping Summary(pl.UTF-8): Commons Digester - odwzorowanie XML-a na obiekty Javy Name: java-commons-digester Version: 1.7 -Release: 2 +Release: 3 License: Apache v2.0 Group: Libraries/Java Source0: http://www.apache.org/dist/commons/digester/source/commons-digester-%{version}-src.tar.gz @@ -18,7 +20,7 @@ BuildRequires: java-commons-beanutils BuildRequires: java-commons-collections BuildRequires: java-commons-logging -BuildRequires: jdk >= 1.2 +BuildRequires: java-gcj-compat-devel BuildRequires: jpackage-utils BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 @@ -72,7 +74,12 @@ required_jars="commons-beanutils-core commons-collections commons-logging" CLASSPATH=$(build-classpath $required_jars) export CLASSPATH -%ant dist +export SHELL=/bin/sh +%ant clean +%ant -Dbuild.compiler=extJavac dist javadoc + +%if %{with javadoc} +%endif %install rm -rf $RPM_BUILD_ROOT @@ -84,27 +91,27 @@ # javadoc %if %{with javadoc} -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a dist/docs/* $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/* $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) -%doc LICENSE.txt RELEASE-NOTES.txt +%doc RELEASE-NOTES.txt %{_javadir}/*.jar %if %{with javadoc} %files javadoc %defattr(644,root,root,755) -%{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} +%{_javadocdir}/%{srcname}-%{version} +%ghost %{_javadocdir}/%{srcname} %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -113,6 +120,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.24 2009/02/16 08:19:22 pawelz +- use java-gcj-compat-devel +- correct dir for javadoc +- rel 3 + Revision 1.23 2008/12/25 20:45:10 pawelz - correct URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-digester.spec?r1=1.23&r2=1.24&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
