SPECS: java-gnu-activation.spec - BR: jpackage-utils, rpmbuild(mac...

[jajcus]

Author: jajcus                       Date: Thu May 25 11:40:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: jpackage-utils, rpmbuild(macros) >= 1.300
- doc subpackage renamed to javadoc
- versioned JAR, compatibility links

---- Files affected:
SPECS:
   java-gnu-activation.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/java-gnu-activation.spec
diff -u SPECS/java-gnu-activation.spec:1.5 SPECS/java-gnu-activation.spec:1.6
--- SPECS/java-gnu-activation.spec:1.5	Tue May 23 08:29:06 2006
+++ SPECS/java-gnu-activation.spec	Thu May 25 13:40:30 2006
@@ -12,6 +12,8 @@
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	jdk
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre
 Provides:	jaf
 Provides:	java-activation
@@ -31,15 +33,16 @@
 operowania na konkretnej zawartości MIME. JAF jednoczy standardy
 internetowe do deklarowania zawartości przy użyciu JavaBeans(TM).
 
-%package doc
+%package javadoc
 Summary:	API documentation for GNU JAF
 Summary(pl):	Dokumentacja API GNU JAF
 Group:		Documentation
+Obsoletes:	java-gnu-activation-doc
 
-%description doc
+%description javadoc
 API documentation for GNU JavaBeans(TM) Activation Framework.
 
-%description doc -l pl
+%description javadoc -l pl
 Dokumentacja API GNU JavaBeans(TM) Activation Framework.
 
 %prep
@@ -49,9 +52,8 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-# Sun java requires . in CLASSPATH for configure test
-export CLASSPATH=.
-export JAVAC=%{_bindir}/javac
+unset CLASSPATH || :
+export JAVAC=%{javac}
 %configure
 
 %{__make}
@@ -60,9 +62,17 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT{%{_javadir}/activation.jar,%{name}-%{version}.jar}
+ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/activation.jar
+ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jaf-1.1.jar
+ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jaf.jar
+cp -R docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -71,9 +81,9 @@
 %doc AUTHORS ChangeLog source/javax/activation/*.html
 %{_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
@@ -81,6 +91,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/05/25 11:40:30  jajcus
+- BR: jpackage-utils, rpmbuild(macros) >= 1.300
+- doc subpackage renamed to javadoc
+- versioned JAR, compatibility links
+
 Revision 1.5  2006/05/23 06:29:06  qboosh
 - capital
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-gnu-activation.spec?r1=1.5&r2=1.6&f=u