commit da62396edcbd24c29a2ebb9bbacb06a4b672d7bf
Author: Mat Booth <fedora(a)matbooth.co.uk>
Date: Wed Jul 31 14:30:22 2013 +0100
Update to latest upstream, rhbz #975516
- Remove activation dep from pom, rhbz #820963
- Adapt for current packaging guidelines
.gitignore | 1 +
apache-commons-email.spec | 60 +++++++++++++++++++-------------------------
commons-email.depmap | 26 -------------------
sources | 2 +-
4 files changed, 28 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab301a1..02ebbc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/commons-email-1.2-src.tar.gz
+/commons-email-1.3.1-src.tar.gz
diff --git a/apache-commons-email.spec b/apache-commons-email.spec
index 0f4f19e..9dcfe2a 100644
--- a/apache-commons-email.spec
+++ b/apache-commons-email.spec
@@ -1,17 +1,14 @@
-%global base_name email
-%global short_name commons-%{base_name}
+%global short_name commons-email
Name: apache-%{short_name}
-Version: 1.2
-Release: 5%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: Apache Commons Email Package
Group: Development/Libraries
License: ASL 2.0
-URL:
http://commons.apache.org/%{base_name}/
-Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
+URL:
http://commons.apache.org/proper/%{short_name}/
+Source0:
http://archive.apache.org/dist/commons/email/source/%{short_name}-%{versi...
-# Depmap needed to remove test deps and fix javax:activation (part of JDK 5+)
-Source1: %{short_name}.depmap
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -38,41 +35,36 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
-%build
-#Skip tests due to missing deps: net.sf.retrotranslator:retrotranslator-runtime
-# org.subethamail:subethasmtp-smtp
-# org.subethamail:subethasmtp-wiser
-mvn-rpmbuild \
- -Dmaven.test.skip=true \
- -Dmaven.local.depmap.file="%{SOURCE1}" \
- install javadoc:aggregate
+# Activation is now provided by the JRE
+%pom_remove_dep "javax.activation:activation"
-%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+# Some test deps are not in fedora
+%pom_remove_dep "org.subethamail:subethasmtp"
+%pom_remove_dep "org.powermock:"
+
+# Compatibility links
+%mvn_alias "org.apache.commons:commons-email"
"commons-email:commons-email"
+%mvn_file :commons-email %{short_name} %{name}
-# poms
-install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name}"
+%build
+# Skip tests due to some missing deps
+%mvn_build -f
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+%install
+%mvn_install
-%files
+%files -f .mfiles
%doc LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
%changelog
+* Wed Jul 31 2013 Mat Booth <fedora(a)matbooth.co.uk> - 1.3.1-1
+- Update to latest upstream, rhbz #975516
+- Remove activation dep from pom, rhbz #820963
+- Adapt for current packaging guidelines
+
* Tue Feb 19 2013 Mat Booth <fedora(a)matbooth.co.uk> - 1.2-5
- Add missing BuildRequires on maven-local
diff --git a/sources b/sources
index bf4cb6c..cc0fda6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66a415001e48616a6e2f93e9716f55ea commons-email-1.2-src.tar.gz
+d48e1edd3898636f79a95afbaf7f6eb9 commons-email-1.3.1-src.tar.gz