Author: glen Date: Fri Dec 7 23:51:53 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - unify java package - version in license - fix java home dir in native part building
---- Files affected: SPECS: jakarta-commons-daemon.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/jakarta-commons-daemon.spec diff -u SPECS/jakarta-commons-daemon.spec:1.16 SPECS/jakarta-commons-daemon.spec:1.17 --- SPECS/jakarta-commons-daemon.spec:1.16 Sat Aug 25 20:45:07 2007 +++ SPECS/jakarta-commons-daemon.spec Sat Dec 8 00:51:47 2007 @@ -1,20 +1,22 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.java Summary: Jakarta Commons Daemon - controlling of Java daemons Summary(pl.UTF-8): Jakarta Commons Daemon - kontrolowanie demonów w Javie Name: jakarta-commons-daemon Version: 1.0.1 -Release: 1 -License: Apache +Release: 2 +License: Apache License 2.0 Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-%{version}.tar.gz # Source0-md5: df3eb5aafa53ca530843a09d40b8a1c0 Patch0: %{name}-link.patch -URL: http://jakarta.apache.org/commons/daemon/ +URL: http://commons.apache.org/daemon/ BuildRequires: ant >= 1.4.1 BuildRequires: automake BuildRequires: jdk >= 1.2 BuildRequires: jpackage-utils BuildRequires: junit >= 3.7 +BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 Requires: jakarta-commons-collections >= 2.0 Requires: jakarta-commons-logging >= 1.0 @@ -36,6 +38,7 @@ Summary: Jakarta Commons Daemon documentation Summary(pl.UTF-8): Dokumentacja do Jakarta Commons Daemon Group: Documentation +Requires: jpackage-utils Obsoletes: jakarta-commons-daemon-doc %description javadoc @@ -51,14 +54,14 @@ %build # Java part required_jars="junit" -export CLASSPATH=$(/usr/bin/build-classpath $required_jars) +export CLASSPATH=$(build-classpath $required_jars) %ant dist # native part cd src/native/unix cp -f /usr/share/automake/config.sub support %configure \ - --with-java=%{_libdir}/java + --with-java=%{java_home} %{__make} %install @@ -72,7 +75,8 @@ # javadoc install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr dist/docs/* $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%{_bindir} install src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir} @@ -81,13 +85,7 @@ rm -rf $RPM_BUILD_ROOT %post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi +ln -nfs %{name}-%{version} %{_javadocdir}/%{name} %files %defattr(644,root,root,755) @@ -98,6 +96,7 @@ %files javadoc %defattr(644,root,root,755) %{_javadocdir}/%{name}-%{version} +%ghost %{_javadocdir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -105,6 +104,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.17 2007-12-07 23:51:47 glen +- unify java package +- version in license +- fix java home dir in native part building + Revision 1.16 2007-08-25 18:45:07 qboosh - added link patch - "jdk" cap already includes JNI headers, so no need to BR any specific VM headers @@ -143,7 +147,7 @@ Revision 1.5 2004/07/15 14:35:03 pluto - config.sub refreshed. - TODO added. -- %%{_javadir}. +- %{_javadir}. Revision 1.4 2003/05/28 12:59:13 malekith - massive attack: source-md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-commons-daemon.spec?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
