SPECS: java-mail.spec - install correct jar - java_sun bcond - dropped SHEL...

[pawelz]

Author: pawelz                       Date: Tue Mar 17 12:40:11 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- install correct jar
- java_sun bcond
- dropped SHELL=/bin/sh (no longer needed)
- rel 4

---- Files affected:
SPECS:
   java-mail.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/java-mail.spec
diff -u SPECS/java-mail.spec:1.35 SPECS/java-mail.spec:1.36
--- SPECS/java-mail.spec:1.35	Mon Feb 23 16:58:44 2009
+++ SPECS/java-mail.spec	Tue Mar 17 13:40:06 2009
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 %bcond_without  javadoc         # don't build javadoc
+%bcond_with	java_sun	# build with java-sun
 #
 %include	/usr/lib/rpm/macros.java
 #
@@ -8,14 +9,15 @@
 Summary(pl.UTF-8):	JavaMail - system pocztowy w Javie
 Name:		java-mail
 Version:	1.4.1
-Release:	3
+Release:	4
 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/
 BuildRequires:	jaf
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:java-sun}
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -57,7 +59,6 @@
 
 %build
 CLASSPATH=$(build-classpath activation)
-export SHELL=/bin/sh
 
 %javac -classpath $CLASSPATH -source 1.4 -target 1.4 -d build $(find -name '*.java')
 %javadoc -all -d apidocs
@@ -66,7 +67,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a %SOURCE0 $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp -a %{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
 
@@ -102,6 +103,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2009/03/17 12:40:06  pawelz
+- install correct jar
+- java_sun bcond
+- dropped SHELL=/bin/sh (no longer needed)
+- rel 4
+
 Revision 1.35  2009/02/23 15:58:44  pawelz
 - build from sources
 - javadocs
================================================================

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