[javapackages-tools] Add maven-local subpackage

Mikolaj Izdebski mizdebsk at fedoraproject.org
Tue Nov 27 10:15:40 UTC 2012


commit a340710c5fe5599e1c061e50acae060609fc69a0
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Nov 27 11:10:43 2012 +0100

    Add maven-local subpackage

 javapackages-tools.spec |   49 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 3 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 6ea12d0..1a3e62c 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,7 +1,7 @@
 Name:           javapackages-tools
 Version:        0.7.5
-Release:        1%{?dist}
-Summary:        Fedora macros and scripts for Java packaging support
+Release:        2%{?dist}
+Summary:        Macros and scripts for Java packaging support
 
 License:        BSD
 URL:            https://fedorahosted.org/javapackages/
@@ -11,10 +11,29 @@ BuildArch:      noarch
 Requires:       libxslt
 Requires:       python
 
+Requires:       jpackage-utils
 Conflicts:      jpackage-utils < 1.7.5-17
 
 %description
-Fedora macros and scripts for Java packaging support
+This package provides macros and scripts to support Java packaging.
+
+%package -n maven-local
+Summary:        Macros and scripts for Maven packaging support
+Requires:       %{name} = %{version}-%{release}
+Requires:       maven
+# POM files needed by maven itself
+Requires:       apache-commons-parent
+Requires:       apache-parent
+Requires:       maven-parent
+Requires:       maven-plugins-pom
+Requires:       mojo-parent
+Requires:       plexus-components-pom
+Requires:       plexus-pom
+Requires:       plexus-tools-pom
+Requires:       sonatype-oss-parent
+
+%description -n maven-local
+This package provides macros and scripts to support packaging Maven artifacts.
 
 
 %prep
@@ -38,6 +57,24 @@ install -pm 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils/
 install -pm 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils/
 
 
+# Ugly as hell, but Eclipse relocated various artifacts under
+# their own groupId. We need to fix this globally.
+# FIXME: this should be moved to respective packages
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet any JPP tomcat-servlet-3.0-api
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.security.auth.message any JPP geronimo-jaspic-spec
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.mail.glassfish any JPP/javamail mail
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.transaction any JPP geronimo-jta
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.annotation any JPP geronimo-annotation
+%add_to_maven_depmap org.eclipse.jetty.orbit org.objectweb.asm any JPP/objectweb-asm asm-all
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet.jsp any JPP tomcat-jsp-api
+%add_to_maven_depmap org.eclipse.jetty.orbit org.apache.jasper.glassfish any JPP glassfish-jsp
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet.jsp.jstl any JPP taglibs-core
+%add_to_maven_depmap org.eclipse.jetty.orbit org.apache.taglibs.standard.glassfish any JPP taglibs-standard
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.el any JPP tomcat-el-2.2-api
+%add_to_maven_depmap org.eclipse.jetty.orbit com.sun.el any JPP tomcat-el-2.2-api
+%add_to_maven_depmap org.eclipse.jetty.orbit org.eclipse.jdt.core any JPP/eclipse jdt.core
+
+
 %files
 %doc LICENSE
 %dir %{_rpmconfigdir}/fileattrs
@@ -49,8 +86,14 @@ install -pm 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils/
 %{_javadir}-utils/pom_editor.sh
 %config(noreplace) %{_sysconfdir}/rpm/macros.fjava
 
+%files -n maven-local
+%{_mavendepmapfragdir}/%{name}
+
 
 %changelog
+* Tue Nov 27 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.7.5-2
+- Add maven-local subpackage
+
 * Thu Nov 08 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.7.5-1
 - Fix versioned pom installation by quoting _jpath
 


More information about the scm-commits mailing list