[javamail] Update to upstream version 1.4.6
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Thu Mar 7 14:21:30 UTC 2013
commit f4afbc8f2ac5185a25ab164b7844659aad41d0bf
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Mar 7 13:51:47 2013 +0100
Update to upstream version 1.4.6
.gitignore | 1 +
all-1.4.3.pom | 429 ------------------------------------------
dsn-1.4.3.pom | 65 -------
imap-1.4.3.pom | 61 ------
javamail-add-osgi-info.patch | 28 ---
javamail-cleanup-poms.patch | 178 -----------------
javamail-parent-distrib.pom | 86 ---------
javamail.spec | 176 +++++-------------
mail-1.4.3.pom | 132 -------------
mailapi-1.4.3.pom | 110 -----------
pop3-1.4.3.pom | 59 ------
smtp-1.4.3.pom | 59 ------
sources | 3 +-
13 files changed, 47 insertions(+), 1340 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98539c9..208f2b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
dsn-1.4.3-sources.jar
mail-1.4.3-sources.jar
+/javamail-1.4.6.tar.xz
diff --git a/javamail.spec b/javamail.spec
index 3125db8..48fcd49 100644
--- a/javamail.spec
+++ b/javamail.spec
@@ -1,60 +1,25 @@
-Name: javamail
-Version: 1.4.3
-Release: 16%{?dist}
-Summary: Java Mail API
-
-Group: Development/Libraries
-License: CDDL or GPLv2 with exceptions
-URL: http://www.oracle.com/technetwork/java/javamail
-
-# Parent POM
-Source0: http://download.java.net/maven/2/com/sun/mail/all/%{version}/all-%{version}.pom
-
-# POMs and source files for things that get built
-Source1: http://download.java.net/maven/2/javax/mail/mail/%{version}/mail-%{version}-sources.jar
-Source2: http://download.java.net/maven/2/javax/mail/mail/%{version}/mail-%{version}.pom
-Source3: http://download.java.net/maven/2/com/sun/mail/dsn/%{version}/dsn-%{version}-sources.jar
-Source4: http://download.java.net/maven/2/com/sun/mail/dsn/%{version}/dsn-%{version}.pom
-
-# Additional POMs for things that are provided by the monolithic mail.jar
-Source5: http://download.java.net/maven/2/javax/mail/mailapi/%{version}/mailapi-%{version}.pom
-Source6: http://download.java.net/maven/2/com/sun/mail/imap/%{version}/imap-%{version}.pom
-Source7: http://download.java.net/maven/2/com/sun/mail/pop3/%{version}/pop3-%{version}.pom
-Source8: http://download.java.net/maven/2/com/sun/mail/smtp/%{version}/smtp-%{version}.pom
-
-# http://kenai.com/projects/javamail/sources/mercurial/content/parent-distrib/pom.xml?raw=true
-Source9: %{name}-parent-distrib.pom
-
-# Add additional OSGi information to manifest of mail.jar
-Patch0: %{name}-add-osgi-info.patch
-
-# Remove Maven plugins we don't have yet
-# Remove unavailable-on-Fedora dependencies from pom.xml
-Patch1: %{name}-cleanup-poms.patch
-
-BuildRequires: jpackage-utils
-BuildRequires: maven-local
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-dependency-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-site-plugin
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: tomcat6-jsp-2.1-api
-
-BuildRequires: java-devel >= 1:1.6.0
-
-Requires: jpackage-utils
-
-# Adapted from the classpathx-mail (and JPackage glassfish-javamail) Provides
-Provides: javamail-monolithic = 0:%{version}
-
-BuildArch: noarch
+Name: javamail
+Version: 1.4.6
+Release: 1%{?dist}
+Summary: Java Mail API
+License: CDDL or GPLv2 with exceptions
+URL: http://www.oracle.com/technetwork/java/javamail
+BuildArch: noarch
+
+# hg clone http://kenai.com/hg/javamail~mercurial
+# (cd ./javamail~mercurial && hg archive -r JAVAMAIL-1_4_6 ../javamail-1.4.6)
+# tar caf javamail-1.4.6.tar.xz javamail-1.4.6
+Source: javamail-1.4.6.tar.xz
+
+BuildRequires: maven-local
+BuildRequires: jvnet-parent
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-plugin-bundle
+
+# Adapted from the classpathx-mail (and JPackage glassfish-javamail) Provides.
+Provides: javamail-monolithic = %{version}-%{release}
%description
The JavaMail API provides a platform-independent and protocol-independent
@@ -62,97 +27,46 @@ framework to build mail and messaging applications.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Documentation
-Requires: jpackage-utils >= 0:1.7.5
+Summary: Javadoc for %{name}
%description javadoc
%{summary}.
%prep
-%setup -c -T
-mkdir -p mail dsn
+%setup -q
-(cd mail && jar xvf %SOURCE1 && cp %SOURCE2 ./pom.xml)
-(cd dsn && jar xvf %SOURCE3 && cp %SOURCE4 ./pom.xml)
+# Remove profiles containing demos and other stuff that is not
+# supposed to be deployable.
+%pom_xpath_remove /pom:project/pom:profiles
-%patch0 -p1
-
-for sub in *; do
- pushd $sub
- mkdir -p src/main/java src/main/resources
- mv META-INF src/main/resources
- [ -e com ] && mv com src/main/java
- [ -e javax ] && mv javax src/main/java
- popd
-done
-
-cp %SOURCE0 ./pom.xml
-mkdir poms
-cp %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 poms
-
-%patch1 -p1
-
-# Convert license file to UTF-8
-for file in mail/src/main/resources/META-INF/*.txt; do
- iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
- touch -r $file $file.new && \
- mv $file.new $file
-done
+# osgiversion-maven-plugin is used to set ${mail.osgiversion} property
+# based on ${project.version}. We don't have osgiversion plugin in
+# Fedora so we'll set ${mail.osgiversion} explicitly.
+%pom_remove_plugin org.glassfish.hk2:osgiversion-maven-plugin
+%pom_xpath_inject /pom:project/pom:properties "<mail.osgiversion>%{version}</mail.osgiversion>"
+# Alternative names for super JAR containing API and implementation.
+%mvn_alias javax.mail:javax.mail-api javax.mail:mailapi \
+ org.eclipse.jetty.orbit:javax.mail.glassfish
%build
-mvn-rpmbuild \
- -Dproject.build.sourceEncoding=UTF-8 \
- -P deploy \
- package javadoc:aggregate
-
+%mvn_build
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-all.pom
-%add_maven_depmap JPP.%{name}-all.pom
-
-# Install everything
-for sub in mail dsn; do
- install -m 644 $sub/target/$sub.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$sub.jar
-done
+%mvn_install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-install -m 644 mail/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-mail.pom
-install -m 644 dsn/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-dsn.pom
-
-# Install the remaining POMs
-for sub in mailapi imap pop3 smtp; do
- install -m 644 poms/$sub-%{version}.pom \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$sub.pom
-done
-
-# Add maven dependency information
-%add_maven_depmap JPP.%{name}-mail.pom %{name}/mail.jar -a "javax.mail:mailapi,com.sun.mail:imap,com.sun.mail:pop3,com.sun.mail:smtp,org.eclipse.jetty.orbit:javax.mail.glassfish"
-%add_maven_depmap JPP.%{name}-dsn.pom %{name}/dsn.jar
-
-install -m 644 poms/%{name}-parent-distrib.pom \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent-distrib.pom
-%add_maven_depmap JPP.%{name}-parent-distrib.pom
-
-
-%files
-%doc mail/src/main/resources/META-INF/LICENSE.txt mail/overview.html
-%{_javadir}/%{name}
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/*.pom
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files -f .mfiles
+%doc mail/src/main/java/overview.html
+%doc mail/src/main/resources/META-INF/LICENSE.txt
+%files javadoc -f .mfiles-javadoc
+%doc mail/src/main/resources/META-INF/LICENSE.txt
%changelog
+* Thu Mar 7 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.4.6-1
+- Update to upstream version 1.4.6
+
* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.4.3-16
- Add depmap for org.eclipse.jetty.orbit
- Resolves: rhbz#917624
diff --git a/sources b/sources
index 2b7a1c4..300b793 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b58478b633703f489b589c2288bf4469 dsn-1.4.3-sources.jar
-4b9994ac98a99fc22e93b93c362a09aa mail-1.4.3-sources.jar
+6987bc7bc70b4cfba5d7f5501822e8c8 javamail-1.4.6.tar.xz
More information about the scm-commits
mailing list