Attachment 583833 Details for Bug 820963 – javax:activation removed from pom

[patch] javax:activation removed from pom

0001-javax-activation-removed-from-pom.patch (text/plain), 3.33 KB, created by gil cattaneo on 2012-05-11 12:47:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-11 12:47:11 UTC

Size: 3.33 KB

patch

obsolete

>From 31d366d906cb139f5a6a6a5d0f1e5bb4511d8e5a Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 11 May 2012 12:44:29 +0200
>Subject: [PATCH] javax:activation removed from pom
>
>---
> apache-commons-email-1.2-pom.patch |   15 +++++++++++++++
> apache-commons-email.spec          |   20 ++++++++++----------
> 2 files changed, 25 insertions(+), 10 deletions(-)
> create mode 100644 apache-commons-email-1.2-pom.patch
>
>diff --git a/apache-commons-email-1.2-pom.patch b/apache-commons-email-1.2-pom.patch
>new file mode 100644
>index 0000000..5bd4a9c
>--- /dev/null
>+++ b/apache-commons-email-1.2-pom.patch
>@@ -0,0 +1,15 @@
>+--- pom.xml	2009-10-26 22:36:58.000000000 +0100
>++++ pom.xml-gil	2012-05-11 12:39:15.012501260 +0200
>+@@ -195,12 +195,6 @@
>+             
>+         </dependency>
>+         <dependency>
>+-            <groupId>javax.activation</groupId>
>+-            <artifactId>activation</artifactId>
>+-            <version>1.1</version>
>+-            
>+-        </dependency>
>+-        <dependency>
>+             <groupId>junit</groupId>
>+             <artifactId>junit</artifactId>
>+             <version>3.8.2</version>
>diff --git a/apache-commons-email.spec b/apache-commons-email.spec
>index f9495db..e11ed28 100644
>--- a/apache-commons-email.spec
>+++ b/apache-commons-email.spec
>@@ -3,7 +3,7 @@
> 
> Name:             apache-%{short_name}
> Version:          1.2
>-Release:          2%{?dist}
>+Release:          3%{?dist}
> Summary:          Apache Commons Email Package
> Group:            Development/Libraries
> License:          ASL 2.0
>@@ -12,6 +12,9 @@ Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short
> 
> # Depmap needed to remove test deps and fix javax:activation (part of JDK 5+)
> Source1:          %{short_name}.depmap
>+# remove:
>+# javax:activation
>+Patch0:           apache-commons-email-1.2-pom.patch
> BuildArch:        noarch
> 
> BuildRequires:    java-devel >= 1:1.6.0
>@@ -39,6 +42,7 @@ This package contains the API documentation for %{name}.
> 
> %prep
> %setup -q -n %{short_name}-%{version}-src
>+%patch0 -p0
> 
> %build
> #Skip tests due to missing deps: net.sf.retrotranslator:retrotranslator-runtime
>@@ -58,31 +62,27 @@ ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
> # poms
> install -d -m 0755 %{buildroot}%{_mavenpomdir}
> install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
>-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
>+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
> 
> # javadoc
> install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
> cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
> 
>-%post
>-%update_maven_depmap
>-
>-%postun
>-%update_maven_depmap
>-
> %files
>-%defattr(-,root,root,-)
> %doc LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
> %{_javadir}/*
> %{_mavenpomdir}/JPP-%{short_name}.pom
> %{_mavendepmapfragdir}/*
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %doc LICENSE.txt NOTICE.txt
> %doc %{_javadocdir}/%{name}
> 
> %changelog
>+* Fri May 11 2012 gil cattaneo <puntogil@libero.it> - 1.2-3
>+- javax:activation removed from pom
>+- adapt to current guideline
>+
> * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 820963: 583833 | 589895