SPECS: javamail.spec - update to 1.4.1 - unify java package

[glen]

Author: glen                         Date: Tue Dec 11 14:26:05 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 1.4.1
- unify java package

---- Files affected:
SPECS:
   javamail.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/javamail.spec
diff -u SPECS/javamail.spec:1.23 SPECS/javamail.spec:1.24
--- SPECS/javamail.spec:1.23	Tue Feb 13 09:06:36 2007
+++ SPECS/javamail.spec	Tue Dec 11 15:25:59 2007
@@ -1,24 +1,27 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	JavaMail - Java mail system
 Summary(pl.UTF-8):	JavaMail - system pocztowy w Javie
 Name:		javamail
-Version:	1.4
+Version:	1.4.1
 Release:	1
 License:	restricted, non-distributable (Sun Binary Code License - see LICENSE.txt)
 Group:		Development/Languages/Java
 # download through forms from http://java.sun.com/products/javamail/downloads/
 Source0:	%{name}-%(echo %{version} | tr . _).zip
-# NoSource0-md5:	4541a84c4d329291fe87b57fde276b0e
+# NoSource0-md5:	21296bdf2e55f2449ab4471b02503a5b
 NoSource:	0
 URL:		http://java.sun.com/products/javamail/
+BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
 Requires:	jaf
+Requires:	jpackage-utils
 Requires:	jre >= 1.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 The JavaMail(TM) API provides a set of abstract classes that model a
 mail system. The API provides a platform independent and protocol
@@ -46,9 +49,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
-install *.jar $RPM_BUILD_ROOT%{_javalibdir}
-install lib/*.jar $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
+cp -a mail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/mail.jar
+
+# put into our own dir so other implementations can override symlinks
+cp -a lib/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
+for a in lib/*.jar; do
+	ln -s %{name}/${a##*/} $RPM_BUILD_ROOT%{_javadir}
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +65,9 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt LICENSE.txt NOTES.txt README.txt
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/*.jar
 
 %files doc
 %defattr(644,root,root,755)
@@ -68,6 +79,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2007-12-11 14:25:59  glen
+- update to 1.4.1
+- unify java package
+
 Revision 1.23  2007-02-13 08:06:36  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/javamail.spec?r1=1.23&r2=1.24&f=u