SPECS: java-gnu-mail.spec - BR: jpackage-utils - javadoc moved to ...

[jajcus]

Author: jajcus                       Date: Thu May 25 12:00:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: jpackage-utils
- javadoc moved to %{_javadocdir} in javadoc subpackage
- versioned jar, compatibility links

---- Files affected:
SPECS:
   java-gnu-mail.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/java-gnu-mail.spec
diff -u SPECS/java-gnu-mail.spec:1.7 SPECS/java-gnu-mail.spec:1.8
--- SPECS/java-gnu-mail.spec:1.7	Tue May 23 22:34:37 2006
+++ SPECS/java-gnu-mail.spec	Thu May 25 14:00:33 2006
@@ -13,6 +13,7 @@
 BuildRequires:	automake
 BuildRequires:	java-gnu-activation
 BuildRequires:	java-gnu-inetlib
+BuildRequires:	jpackage-utils
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre
 Provides:	javamail = 1.3
@@ -36,15 +37,15 @@
 pod kątem wolnodostępnych implementacji Javy, ale nic nie powstrzymuje
 przed wykorzystaniem go z dowolnym zgodnym JVM-em.
 
-%package doc
+%package javadoc
 Summary:	API documentation for GNU JavaMail
 Summary(pl):	Dokumentacja API GNU JavaMail
 Group:		Documentation
 
-%description doc
+%description javadoc
 API documentation for GNU JavaMail.
 
-%description doc -l pl
+%description javadoc -l pl
 Dokumentacja API GNU JavaMail.
 
 %prep
@@ -54,8 +55,7 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-# Sun java requires . in CLASSPATH for configure test
-export CLASSPATH=.
+unset CLASSPATH || :
 export JAVAC=%{javac}
 export JAVA=%{java}
 %configure
@@ -65,13 +65,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# should it be javamail.jar or mail.jar (or both)?  log4j's build.xml
-# seeks for the former, sun's javamail contains the latter.
-ln -s gnumail.jar $RPM_BUILD_ROOT%{_javadir}/javamail.jar
+mv $RPM_BUILD_ROOT{%{_javadir}/gnumail.jar,gnumail-%{version}.jar}
+ln -s gnumail-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/gnumail.jar
+ln -s gnumail-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/mail.jar
+ln -s gnumail-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/mailapi.jar
+
+cp -R docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,9 +85,9 @@
 %doc AUTHORS ChangeLog README* source/javax/mail/*.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
@@ -91,6 +95,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/05/25 12:00:33  jajcus
+- BR: jpackage-utils
+- javadoc moved to %{_javadocdir} in javadoc subpackage
+- versioned jar, compatibility links
+
 Revision 1.7  2006/05/23 20:34:37  glen
 - rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-gnu-mail.spec?r1=1.7&r2=1.8&f=u