Author: jajcus Date: Thu May 25 11:50:44 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: jpackage-utils, rpmbuild(macros) >= 1.300 - API docs moved to %{_javadocdir} in javadoc subpackage
---- Files affected: SPECS: java-gnu-inetlib.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/java-gnu-inetlib.spec diff -u SPECS/java-gnu-inetlib.spec:1.3 SPECS/java-gnu-inetlib.spec:1.4 --- SPECS/java-gnu-inetlib.spec:1.3 Tue May 23 18:24:53 2006 +++ SPECS/java-gnu-inetlib.spec Thu May 25 13:50:39 2006 @@ -13,6 +13,8 @@ BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: jdk +BuildRequires: jpackage-utils +BuildRequires: rpmbuild(macros) >= 1.300 Requires: jre BuildArch: noarch ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch @@ -64,15 +66,15 @@ protokołów. Można ich używać w celu dodania obsługi odpowiednich schematów URL-i do klasy java.net.URL. -%package doc +%package javadoc Summary: API documentation for GNU inetlib Summary(pl): Dokumentacja API GNU inetlib Group: Documentation -%description doc +%description javadoc API documentation for GNU inetlib. -%description doc -l pl +%description javadoc -l pl Dokumentacja API GNU inetlib. %prep @@ -83,8 +85,8 @@ %{__aclocal} %{__autoconf} %{__automake} -# Sun java requires . in CLASSPATH for configure test -export CLASSPATH=. +unset CLASSPATH || : +export JAVA_HOME=%{java_home} export JAVAC=%{_bindir}/javac export JAVA=%{_bindir}/java %configure @@ -95,9 +97,13 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} + %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +cp -R docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} + %clean rm -rf $RPM_BUILD_ROOT @@ -106,9 +112,9 @@ %doc AUTHORS ChangeLog README %{_javadir}/*.jar -%files doc +%files javadoc %defattr(644,root,root,755) -%doc docs/* +%doc %{_javadocdir}/%{name}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -116,6 +122,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2006/05/25 11:50:39 jajcus +- BR: jpackage-utils, rpmbuild(macros) >= 1.300 +- API docs moved to %{_javadocdir} in javadoc subpackage + Revision 1.3 2006/05/23 16:24:53 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/java-gnu-inetlib.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit