commit e4800b71a12d08e4fe92de0d6db48e3d21116f4b
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Sun Nov 6 22:05:03 2011 +0200
Update to 2.4.2 upstream release.
.gitignore | 1 +
maven-archiver-depmap.xml | 15 ---------------
maven-archiver.spec | 16 ++++++++--------
sources | 3 +--
4 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd4378e..48e41f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-archiver-2.2-src.tgz
maven-archiver-2.4-src.tar.bz2
maven-archiver-2.4.1-src.tar.xz
+maven-archiver-2.4.2-source-release.zip
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 415079d..c203dfd 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -29,18 +29,15 @@
#
Name: maven-archiver
-Version: 2.4.1
-Release: 7%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
Epoch: 0
Summary: Maven Archiver
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.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
+Source0:
http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}...
Patch0: %{name}-maven-core-dep.patch
@@ -85,14 +82,14 @@ Requires: jpackage-utils
Javadoc for %{name}.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
#tests don't compile with maven 2.2.1
rm -fr src/test/java/org/apache/maven/archiver/*.java
%build
-mvn-rpmbuild install javadoc:aggregate
+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
%install
@@ -122,6 +119,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/*
%changelog
+* Sun Nov 6 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.4.2-1
+- Update to 2.4.2 upstream release.
+
* Mon Sep 19 2011 Tomas Radej <tradej(a)redhat.com> - 0:2.4.1-7
- Fixed dep on maven-core artifact
- Minor fixes
diff --git a/sources b/sources
index 051ab68..7735b9c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-68294b974653b0cf6392a5bc91a56a57 maven-archiver-2.4-src.tar.bz2
-225ebc6dc4a89e70e94dffd9b8723dee maven-archiver-2.4.1-src.tar.xz
+439c6ee7e817f367b7c6d004d333512d maven-archiver-2.4.2-source-release.zip