pool/javamail
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 962939 from Java:packages

Browse Source 
Build with source/target levels 8

OBS-URL: https://build.opensuse.org/request/show/962939
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javamail?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2022-03-28 14:59:10 +00:00 committed by Git OBS Bridge
commit 892a7aa736
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
javamail.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Mar 18 19:20:43 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source/target levels 8
-------------------------------------------------------------------
Thu Mar 17 03:07:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Add glassfish-activation-api dependency for relevant distribution
versions to make buildable with JDK that does not contain the
JavaEE modules
-------------------------------------------------------------------
Mon Apr 8 11:14:08 UTC 2019 - Fridrich Strba <fstrba@suse.com>

20
javamail.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package javamail
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -23,17 +23,22 @@ Release: 0
Summary: Java Mail API
License: CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0
Group: Development/Libraries/Java
URL: http://www.oracle.com/technetwork/java/javamail
URL: https://www.oracle.com/technetwork/java/javamail
Source: https://github.com/javaee/javamail/archive/%{git_tag}.tar.gz
Patch0: %{name}-javadoc.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: perl-XML-XPath
# Adapted from the classpathx-mail (and JPackage glassfish-javamail) Provides.
Provides: javamail-monolithic = %{version}-%{release}
Provides: javax.mail
BuildArch: noarch
%if 0%{?suse_version} > 1500
BuildRequires: glassfish-activation-api
Requires: mvn(javax.activation:activation)
%endif
%description
The JavaMail API provides a platform-independent and protocol-independent
@ -50,6 +55,10 @@ Group: Documentation/HTML
%setup -q -n %{name}-%{git_tag}
%patch0 -p1
%if 0%{?suse_version} <= 1500
%pom_remove_dep javax.activation:activation pom.xml
%endif
add_dep() {
%pom_xpath_inject pom:project "<dependencies/>" ${2}
%pom_add_dep com.sun.mail:${1}:%{version}:provided ${2}
@ -69,7 +78,6 @@ add_dep javax.mail mailapijar
# based on ${project.version}. We don't have osgiversion plugin so we
# will set ${mail.osgiversion} explicitly.
%pom_remove_plugin org.glassfish.hk2:osgiversion-maven-plugin
%pom_remove_dep javax.activation:activation
%pom_xpath_inject /pom:project/pom:properties "<mail.osgiversion>%{version}</mail.osgiversion>"
%pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true</_nouses>"
@ -80,7 +88,11 @@ rm mail/src/test/java/com/sun/mail/smtp/SMTPWriteTimeoutTest.java
%pom_remove_parent .
%build
%{ant} -Djavac.source=1.6 -Djavac.target=1.6 jar jars docs
%{ant} -Djavac.source=1.8 -Djavac.target=1.8 \
%if 0%{?suse_version} > 1500
-Dactivation.jar=$(find-jar glassfish-activation-api) \
%endif
jar jars docs
%install
get_name() {