Author: pawelz Date: Thu Feb 12 16:39:57 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - unified %%build - more %%docs - install javadoc in correct dir - build with java-gcj-compat-devel - do not R jre - rel 5
---- Files affected: SPECS: java-commons-daemon.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/java-commons-daemon.spec diff -u SPECS/java-commons-daemon.spec:1.25 SPECS/java-commons-daemon.spec:1.26 --- SPECS/java-commons-daemon.spec:1.25 Thu Dec 25 21:12:57 2008 +++ SPECS/java-commons-daemon.spec Thu Feb 12 17:39:52 2009 @@ -3,11 +3,13 @@ %bcond_without javadoc # don't build javadoc %include /usr/lib/rpm/macros.java + +%define srcname commons-daemon Summary: Commons Daemon - controlling of Java daemons Summary(pl.UTF-8): Commons Daemon - kontrolowanie demonów w Javie Name: java-commons-daemon Version: 1.0.1 -Release: 4 +Release: 5 License: Apache v2.0 Group: Libraries/Java Source0: http://www.apache.org/dist/commons/daemon/source/daemon-%{version}.tar.gz @@ -16,7 +18,7 @@ URL: http://commons.apache.org/daemon/ BuildRequires: ant >= 1.4.1 BuildRequires: automake -BuildRequires: jdk >= 1.2 +BuildRequires: java-gcj-compat-devel BuildRequires: jpackage-utils BuildRequires: junit >= 3.7 BuildRequires: rpm-javaprov @@ -25,7 +27,6 @@ Requires: java-commons-collections >= 2.0 Requires: java-commons-logging >= 1.0 Requires: jpackage-utils -Requires: jre >= 1.2 Provides: jakarta-commons-daemon Obsoletes: jakarta-commons-daemon BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -64,8 +65,15 @@ %build # Java part required_jars="junit" -export CLASSPATH=$(build-classpath $required_jars) -%ant dist +CLASSPATH=$(build-classpath $required_jars) +export CLASSPATH +%ant -Dbuild.compiler=extJavac jar + +# javadoc +%if %{with javadoc} +export SHELL=/bin/sh +%ant javadoc +%endif # native part cd src/native/unix @@ -80,14 +88,14 @@ install -d $RPM_BUILD_ROOT%{_javadir} # jars -cp -a dist/commons-daemon.jar $RPM_BUILD_ROOT%{_javadir}/commons-daemon-%{version}.jar -ln -s commons-daemon-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-daemon.jar +cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar +ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar # 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 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} @@ -98,11 +106,11 @@ 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 dist/LICENSE +%doc PROPOSAL.html RELEASE-NOTES.txt STATUS.html %attr(755,root,root) %{_bindir}/jsvc %{_mandir}/man1/jsvc.1* %{_javadir}/*.jar @@ -110,8 +118,8 @@ %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"`) @@ -120,6 +128,14 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2009/02/12 16:39:52 pawelz +- unified %%build +- more %%docs +- install javadoc in correct dir +- build with java-gcj-compat-devel +- do not R jre +- rel 5 + Revision 1.25 2008/12/25 20:12:57 pawelz - new source url ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-daemon.spec?r1=1.25&r2=1.26&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
