[maven-eclipse-plugin] Fix FTBFS caused by missing BRs

Mat Booth mbooth at fedoraproject.org
Tue Feb 10 15:20:40 UTC 2015


commit 4178066c4976233abdf049de4bf8c5d0c9d9f702
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Feb 10 15:20:24 2015 +0000

    Fix FTBFS caused by missing BRs
    
    - Drop ancient maven2-* provides/obsoletes
    - Fix dir ownership

 maven-eclipse-plugin.spec |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/maven-eclipse-plugin.spec b/maven-eclipse-plugin.spec
index 266324e..7e601c7 100644
--- a/maven-eclipse-plugin.spec
+++ b/maven-eclipse-plugin.spec
@@ -3,10 +3,9 @@
 
 Name:           maven-eclipse-plugin
 Version:        2.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Maven Eclipse Plugin
 
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-eclipse-plugin/
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
@@ -20,34 +19,28 @@ ExclusiveArch: %{ix86} x86_64
 BuildArch: noarch
 %endif
 
-# Basic stuff
-BuildRequires: jpackage-utils
-BuildRequires: java-devel >= 1:1.6.0
-
 # Maven and its dependencies
 BuildRequires: maven-local
 BuildRequires: maven-test-tools
 BuildRequires: maven-plugin-testing-tools
+BuildRequires: maven-osgi
 # Others
 BuildRequires: apache-commons-io
 BuildRequires: xmlunit
 BuildRequires: eclipse-platform
 BuildRequires: plexus-resources
+BuildRequires: plexus-interactivity-jline
 BuildRequires: bsf
 BuildRequires: jaxen
 BuildRequires: dom4j
 BuildRequires: xom
 BuildRequires: saxpath
 
-Provides:       maven2-plugin-eclipse = 0:%{version}-%{release}
-Obsoletes:      maven2-plugin-eclipse <= 0:2.0.8
-
 %description
 The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath 
 and the .settings folder) from a POM.
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
 
 %description javadoc
@@ -77,6 +70,8 @@ plugin_file=`ls /usr/lib{,64}/eclipse/plugins/org.eclipse.core.resources_*jar ||
 
 ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
 
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId[text()='org.eclipse.core']]" "<scope>provided</scope>"
+
 # Skip tests because they do not compile
 %mvn_build -- -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL
 
@@ -85,11 +80,18 @@ ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
 
 %files -f .mfiles
 %doc LICENSE NOTICE DEPENDENCIES README-testing.txt
+%dir %{_javadir}/maven-eclipse-plugin
+%dir %{_mavenpomdir}/maven-eclipse-plugin
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Tue Feb 10 2015 Mat Booth <mat.booth at redhat.com> - 2.9-12
+- Fix FTBFS caused by missing BRs
+- Drop ancient maven2-* provides/obsoletes
+- Fix dir ownership
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list