Attachment 589895 Details for Bug 820963 – javax:activation retrotranslator-runtime subethasmtp-smtp subethasmtp-wiser removed from pom

[patch] javax:activation retrotranslator-runtime subethasmtp-smtp subethasmtp-wiser removed from pom

0001-javax-activation-retrotranslator-runtime-subethasmtp.patch (text/plain), 5.12 KB, created by gil cattaneo on 2012-06-06 13:39:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-06-06 13:39:35 UTC

Size: 5.12 KB

patch

obsolete

>From 2e27692abaa87a8e9d4a5de428e881b9969a5746 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Wed, 6 Jun 2012 13:38:56 +0200
>Subject: [PATCH] javax:activation retrotranslator-runtime subethasmtp-smtp
> subethasmtp-wiser removed from pom
>
>---
> apache-commons-email-1.2-pom.patch |   49 ++++++++++++++++++++++++++++++++++++
> apache-commons-email.spec          |   25 +++++++++---------
> 2 files changed, 62 insertions(+), 12 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..4a7b12d
>--- /dev/null
>+++ b/apache-commons-email-1.2-pom.patch
>@@ -0,0 +1,49 @@
>+--- pom.xml	2009-10-26 22:36:58.000000000 +0100
>++++ pom.xml-gil	2012-06-06 13:30:32.383969606 +0200
>+@@ -195,18 +195,12 @@
>+             
>+         </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>
>+             <scope>test</scope>
>+         </dependency>
>+-        <dependency>
>++        
>++            <<url>http://subethasmtp.tigris.org/</url>>
>+             <scope>test</scope>
>+         </dependency>
>+         <dependency>
>+@@ -225,7 +219,7 @@
>+             <artifactId>subethasmtp-wiser</artifactId>
>+             <version>1.2</version>
>+             <classifier>java14</classifier>
>+-            
>++            <<url>http://subethasmtp.tigris.org/wiser.html</url>>
>+             <scope>test</scope>
>+             <exclusions>
>+                 <exclusion>
>+@@ -233,7 +227,7 @@
>+                     <artifactId>subethasmtp-smtp</artifactId>
>+                 </exclusion>
>+             </exclusions>
>+-        </dependency>
>++        </dependency-->
>+     </dependencies>
>+ 
>+     <properties>
>diff --git a/apache-commons-email.spec b/apache-commons-email.spec
>index f9495db..3c6c5dd 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,12 @@ 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
>+# net.sf.retrotranslator:retrotranslator-runtime
>+# org.subethamail:subethasmtp-smtp
>+# org.subethamail:subethasmtp-wiser
>+Patch0:           apache-commons-email-1.2-pom.patch
> BuildArch:        noarch
> 
> BuildRequires:    java-devel >= 1:1.6.0
>@@ -21,8 +27,6 @@ BuildRequires:    javamail
> Requires:         javamail
> Requires:         java >= 1:1.6.0
> Requires:         jpackage-utils
>-Requires(post):   jpackage-utils
>-Requires(postun): jpackage-utils
> 
> %description
> Commons-Email aims to provide an API for sending email. It is built on top of 
>@@ -39,6 +43,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 +63,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 retrotranslator-runtime subethasmtp-smtp subethasmtp-wiser 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