[maven-idea-plugin] Simplify build dependencies
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Apr 29 12:04:54 UTC 2013
commit 93f88124788e21984d9a5387f55fc086d9caf33e
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Apr 29 13:44:50 2013 +0200
Simplify build dependencies
- Replace POM patch with POM macro
- Update to current packaging guidelines
add_compat.patch | 14 -------------
maven-idea-plugin.spec | 50 +++++++++++++++++++++++------------------------
2 files changed, 24 insertions(+), 40 deletions(-)
---
diff --git a/maven-idea-plugin.spec b/maven-idea-plugin.spec
index bb3b18d..60811d9 100644
--- a/maven-idea-plugin.spec
+++ b/maven-idea-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-idea-plugin
Version: 2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Maven IDEA Plugin
Group: Development/Libraries
@@ -10,48 +10,41 @@ URL: http://maven.apache.org/plugins/%{name}
# tar caf maven-idea-plugin-2.2.tar.xz maven-idea-plugin-2.2
Source0: %{name}-%{version}.tar.xz
Source1: http://apache.org/licenses/LICENSE-2.0.txt
-Patch0: add_compat.patch
BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: plexus-utils
-BuildRequires: ant
-BuildRequires: maven-local
-BuildRequires: maven-wagon
-BuildRequires: plexus-container-default
-BuildRequires: maven-install-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: dom4j
-
-Obsoletes: maven2-plugin-idea <= 0:2.0.8
-Provides: maven2-plugin-idea = 1:%{version}-%{release}
+BuildRequires: maven-local
+BuildRequires: mvn(dom4j:dom4j)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugins)
+BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness)
+BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-artifact-manager)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-model)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+
+Obsoletes: maven2-plugin-idea <= 0:2.0.8
+Provides: maven2-plugin-idea = 1:%{version}-%{release}
%description
The IDEA Plugin is used to generate files (ipr, iml, and iws) for a
project so you can work on it using the IDE, IntelliJ IDEA.
-
%package javadoc
-Group: Documentation
Summary: API documentation for %{name}
%description javadoc
%{summary}.
-
%prep
%setup -q
-%patch0
-
cp %{SOURCE1} .
+%pom_add_dep org.apache.maven:maven-compat
%build
# we skip test because even with binary mvn release these fail for
@@ -69,6 +62,11 @@ cp %{SOURCE1} .
%doc LICENSE-2.0.txt
%changelog
+* Mon Apr 29 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-13
+- Simplify build dependencies
+- Replace POM patch with POM macro
+- Update to current packaging guidelines
+
* Tue Feb 12 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-12
- Use default packaging layout
More information about the scm-commits
mailing list