[java-sig-commits] [maven-archiver/f16] Fixed dep, minor fixes

[Tomas Radej]

commit 456f787bf75f1cd5a71c9c3767f7eeacff1c8f16
Author: Tomas Radej <tradej at redhat.com>
Date:   Mon Sep 19 11:29:40 2011 +0200

    Fixed dep, minor fixes

 maven-archiver-maven-core-dep.patch |   22 ++++++++++++++++++++++
 maven-archiver.spec                 |   19 ++++++++++++-------
 2 files changed, 34 insertions(+), 7 deletions(-)
---
diff --git a/maven-archiver-maven-core-dep.patch b/maven-archiver-maven-core-dep.patch
new file mode 100644
index 0000000..4ea50e7
--- /dev/null
+++ b/maven-archiver-maven-core-dep.patch
@@ -0,0 +1,22 @@
+diff --git a/pom.xml b/pom.xml
+index 365b10b..6f0f82b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -53,11 +53,16 @@
+   <dependencies>
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+-      <artifactId>maven-artifact</artifactId>
++      <artifactId>maven-core</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven</groupId>
++      <artifactId>maven-artifact</artifactId>
++      <version>${mavenVersion}</version>
++    </dependency>
++  <dependency>
++      <groupId>org.apache.maven</groupId>
+       <artifactId>maven-model</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 3064f39..415079d 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -30,7 +30,7 @@
 
 Name:           maven-archiver
 Version:        2.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Maven Archiver
 License:        ASL 2.0
@@ -42,6 +42,8 @@ URL:            http://maven.apache.org/
 Source0:        %{name}-%{version}-src.tar.xz
 Source1:        %{name}-depmap.xml
 
+Patch0:         %{name}-maven-core-dep.patch
+
 BuildArch:      noarch
 
 BuildRequires:  java-devel >= 1:1.6.0
@@ -67,8 +69,6 @@ Requires:       plexus-archiver >= 1.0-0.1.a7
 Requires:       plexus-interpolation
 Requires:       plexus-utils
 
-Requires(post):   jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
 Provides: maven-shared-archiver = %{version}-%{release}
 Obsoletes: maven-shared-archiver < %{version}-%{release}
 
@@ -86,6 +86,7 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 
 #tests don't compile with maven 2.2.1
 rm -fr src/test/java/org/apache/maven/archiver/*.java
@@ -104,9 +105,9 @@ install -pm 644 target/%{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # Copy pom
-install -pm 644 pom.xml \
-  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-archiver.pom
-%add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP maven-archiver
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -114,13 +115,17 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %{_javadir}/*
-%{_mavenpomdir}/JPP-maven-archiver.pom
+%{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Sep 19 2011 Tomas Radej <tradej at redhat.com> - 0:2.4.1-7
+- Fixed dep on maven-core artifact
+- Minor fixes
+ 
 * Wed Jun 8 2011 Alexander Kurtakov <akurtako at redhat.com> 0:2.4.1-6
 - Build with maven 3.x.