rpms/maven-archiver/devel maven-archiver-depmap.xml, NONE, 1.1 sources, 1.3, 1.4 maven-archiver.spec, 1.3, 1.4

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-archiver/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11920/devel

Modified Files:
	sources maven-archiver.spec 
Added Files:
	maven-archiver-depmap.xml 
Log Message:
Update to 2.4.1.


--- NEW FILE maven-archiver-depmap.xml ---
<dependencies>
	<dependency>
	  <maven>
		<groupId>org.apache.maven</groupId>
		<artifactId>maven-archiver</artifactId>
		<version>2.4</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>maven-archiver</artifactId>
		<version>2.4</version>
	  </jpp>
	</dependency>
</dependencies>



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-archiver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Dec 2009 21:27:59 -0000	1.3
+++ sources	28 May 2010 21:19:11 -0000	1.4
@@ -1 +1,2 @@
 68294b974653b0cf6392a5bc91a56a57  maven-archiver-2.4-src.tar.bz2
+225ebc6dc4a89e70e94dffd9b8723dee  maven-archiver-2.4.1-src.tar.xz


Index: maven-archiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-archiver/devel/maven-archiver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- maven-archiver.spec	23 Dec 2009 21:27:59 -0000	1.3
+++ maven-archiver.spec	28 May 2010 21:19:11 -0000	1.4
@@ -28,10 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define namedversion 1.0-alpha-7
-
 Name:           maven-archiver
-Version:        2.4
+Version:        2.4.1
 Release:        1%{?dist}
 Epoch:          0
 Summary:        Maven Archiver
@@ -39,12 +37,10 @@ License:        ASL 2.0
 Group:          Development/Libraries
 URL:            http://maven.apache.org/
 
-# svn export \
-# https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.4 \
-# maven-archiver
-# tar cjf maven-archiver-2.4-src.tar.bz2 maven-archiver/
-Source0:        %{name}-%{version}-src.tar.bz2
-
+# svn export https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.4.1 maven-archiver
+# tar caf maven-archiver-2.4.1-src.tar.xz maven-archiver/
+Source0:        %{name}-%{version}-src.tar.xz
+Source1:        %{name}-depmap.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -71,6 +67,8 @@ 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}
 
 %description
 The Maven Archiver is used by other Maven plugins
@@ -79,6 +77,7 @@ to handle packaging
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -95,6 +94,7 @@ mvn-jpp \
     -e \
     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
     -Dmaven.test.failure.ignore=true \
+    -Dmaven2.jpp.depmap.file=%{SOURCE1} \
     install javadoc:javadoc
 
 
@@ -124,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_javadir}
+%{_javadir}/*
 %{_datadir}/maven2/poms/JPP-maven-archiver.pom
 %{_mavendepmapfragdir}/%{name}
 
@@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Sat May 29 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.4.1-1
+- Update to 2.4.1.
+
 * Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.4-1
 - Update to 2.4.