packages: java-mail/java-mail.spec - up to 1.4.4, package javamail.jar as well

[glen]

Author: glen                         Date: Sun Oct 23 17:01:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.4, package javamail.jar as well

---- Files affected:
packages/java-mail:
   java-mail.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/java-mail/java-mail.spec
diff -u packages/java-mail/java-mail.spec:1.43 packages/java-mail/java-mail.spec:1.44
--- packages/java-mail/java-mail.spec:1.43	Wed Feb  9 18:49:40 2011
+++ packages/java-mail/java-mail.spec	Sun Oct 23 19:01:41 2011
@@ -2,20 +2,21 @@
 #
 # Conditional build:
 %bcond_without  javadoc         # don't build javadoc
-#
+
+%define		srcname	mail
+%define		ver		%(echo %{version} | tr . _)
 %include	/usr/lib/rpm/macros.java
-#
-%define	srcname	mail
 Summary:	JavaMail - Java mail system
 Summary(pl.UTF-8):	JavaMail - system pocztowy w Javie
 Name:		java-mail
-Version:	1.4.1
-Release:	6
+Version:	1.4.4
+Release:	1
 License:	CDDL
 Group:		Libraries/Java
-Source0:	https://maven-repository.dev.java.net/nonav/repository/javax.mail/jars/mail-%{version}-sources.jar
-# Source0-md5:	e5517da355c865a6451c451e45ccbba1
-URL:		http://java.sun.com/products/javamail/
+#Source0:	http://download.oracle.com/otn-pub/java/javamail/%{version}/javamail%{ver}.zip
+Source0:	http://download.java.net/maven/2/com/sun/mail/javax.mail/1.4.4/javax.mail-1.4.4-sources.jar
+# Source0-md5:	605fd51ed38eb2af777d40fc29454008
+URL:		http://www.oracle.com/technetwork/java/javamail/index.html
 BuildRequires:	java(jaf)
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
@@ -63,21 +64,30 @@
 CLASSPATH=$(build-classpath activation)
 
 install -d build
-%javac -classpath $CLASSPATH -source 1.4 -target 1.4 -d build $(find -name '*.java')
+%javac \
+	-classpath $CLASSPATH \
+	-source 1.4 \
+	-target 1.4 \
+	-d build $(find -name '*.java')
+
+%jar \
+	-cfm %{srcname}-%{version}.jar \
+	META-INF/MANIFEST.MF \
+	-C build \
+	. META-INF
 
 %if %{with javadoc}
 %javadoc -d apidocs \
 	$(find com/sun/mail -name '*.java')
 %endif
 
-%jar -cf %{srcname}-%{version}.jar -C build .
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp -p %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/javamail-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/javamail.jar
 
 # javadoc
 %if %{with javadoc}
@@ -94,9 +104,10 @@
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/javamail-%{version}.jar
 %{_javadir}/%{srcname}-%{version}.jar
 %{_javadir}/%{srcname}.jar
+%{_javadir}/javamail-%{version}.jar
+%{_javadir}/javamail.jar
 
 %if %{with javadoc}
 %files javadoc
@@ -111,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2011/10/23 17:01:41  glen
+- up to 1.4.4, package javamail.jar as well
+
 Revision 1.43  2011/02/09 17:49:40  qboosh
 - -javadoc O: javamail-doc
 
@@ -153,7 +167,7 @@
 - Libraries/Java group
 
 Revision 1.32  2009/02/02 12:16:29  pawelz
-- symlinks in %%install. It builds now.
+- symlinks in %install. It builds now.
 
 Revision 1.31  2009/02/02 12:12:15  pawelz
 - fixed Name
@@ -165,7 +179,7 @@
 - renamed from javamail.spec
 
 Revision 1.28  2009/02/02 07:18:34  pawelz
-- removed %%setup (source is not archive)
+- removed %setup (source is not archive)
 - typo
 
 Revision 1.27  2009/02/02 07:03:21  pawelz
@@ -234,7 +248,7 @@
 - changes for compatibilty with javamail 1.3 (download from SUN)
 
 Revision 1.7  2002/08/24 20:25:59  qboosh
-- new %%doc, License fix, R: jre >= 1.1
+- new %doc, License fix, R: jre >= 1.1
 
 Revision 1.6  2002/04/25 16:38:52  arturs
 - fixed a small typo
@@ -250,7 +264,7 @@
 - perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.2  2001/11/30 10:16:35  qboosh
-- descriptions, cosmetics, removed %%{_javalibdir} from package
+- descriptions, cosmetics, removed %{_javalibdir} from package
 
 Revision 1.1  2001/10/02 07:43:42  pascalek
 - initial revision
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-mail/java-mail.spec?r1=1.43&r2=1.44&f=u