[maven-eclipse-plugin] Update for newer guidelines rhbz #992186 Install license files
mbooth
mbooth at fedoraproject.org
Sun Aug 18 15:21:52 UTC 2013
commit 728d233516269b3dbc3dd7fe7d0890f4efe042ef
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Sun Aug 18 16:21:21 2013 +0100
Update for newer guidelines rhbz #992186
Install license files
maven-eclipse-plugin.spec | 70 ++++++++++++--------------------------------
1 files changed, 19 insertions(+), 51 deletions(-)
---
diff --git a/maven-eclipse-plugin.spec b/maven-eclipse-plugin.spec
index 39d310f..f8922de 100644
--- a/maven-eclipse-plugin.spec
+++ b/maven-eclipse-plugin.spec
@@ -1,6 +1,9 @@
+# Eclipse does not yet export virtual maven provides, so filter out the requires
+%global __requires_exclude mvn\\(org\\.eclipse\\.core:resources\\)
+
Name: maven-eclipse-plugin
Version: 2.9
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Maven Eclipse Plugin
Group: Development/Libraries
@@ -23,22 +26,8 @@ BuildRequires: java-devel >= 1:1.6.0
# Maven and its dependencies
BuildRequires: maven-local
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-archiver
-BuildRequires: maven-shared-osgi
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-idea-plugin
-BuildRequires: maven-invoker-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-shared-invoker
+BuildRequires: maven-test-tools
+BuildRequires: maven-plugin-testing-tools
# Others
BuildRequires: apache-commons-io
BuildRequires: easymock
@@ -51,15 +40,6 @@ BuildRequires: dom4j
BuildRequires: xom
BuildRequires: saxpath
-
-Requires: java
-Requires: maven
-Requires: apache-commons-io
-Requires: plexus-resources
-Requires: jpackage-utils
-Requires: jsch
-Requires: jtidy
-
Provides: maven2-plugin-eclipse = 0:%{version}-%{release}
Obsoletes: maven2-plugin-eclipse <= 0:2.0.8
@@ -70,7 +50,6 @@ and the .settings folder) from a POM.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -85,8 +64,9 @@ API documentation for %{name}.
sed -i -e "s|3.3.0-v20070604|3.7.100.v20110510-0712|g" pom.xml
%build
+# Create a local repo for the eclipse dependency because eclipse
+# does not yet export virtual mvn provides or ship pom files
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
CORE_FAKE_VERSION="3.7.100.v20110510-0712"
CORE_PLUGIN_DIR=$MAVEN_REPO_LOCAL/org/eclipse/core/resources/$CORE_FAKE_VERSION
@@ -95,35 +75,23 @@ plugin_file=`ls %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*jar`
ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
-mvn-rpmbuild -e \
- -Dmaven.test.skip=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:aggregate
+# Skip tests because they do not compile
+%mvn_build -- -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%files -f .mfiles
+%doc LICENSE NOTICE DEPENDENCIES README-testing.txt
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
%changelog
+* Sun Aug 18 2013 Mat Booth <fedora at matbooth.co.uk> - 2.9-7
+- Update for newer guidelines rhbz #992186
+- Install license files
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list