commit 6b3ec3f80bb578235bf4667ff4fa2282caae7133
Author: spike <spike(a)fedoraproject.org>
Date: Fri Apr 15 06:15:25 2011 +0200
New tzdata (2011f)
Fixed build for maven 3
Cleaned up BRs
.gitignore | 1 +
joda-time.spec | 34 ++++++++++------------------------
sources | 2 +-
3 files changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e37786e..fac61c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ tzdata2008i.tar.gz
/joda-time-1.6.2-src.tar.gz
/tzdata2010l.tar.gz
/tzdata2010n.tar.gz
+/tzdata2011f.tar.gz
diff --git a/joda-time.spec b/joda-time.spec
index 49ec361..7fb6719 100644
--- a/joda-time.spec
+++ b/joda-time.spec
@@ -1,4 +1,4 @@
-%global tzversion tzdata2010n
+%global tzversion tzdata2011f
Name: joda-time
Version: 1.6.2
@@ -17,20 +17,7 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2 >= 2.2.1
-BuildRequires: maven-clean-plugin
-BuildRequires: maven-compiler-plugin
-#BuildRequires: maven-toolchains-plugin
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-repository-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: maven-site-plugin
+BuildRequires: maven
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -75,12 +62,9 @@ tar -xzf %{SOURCE1} -C src/main/java/org/joda/time/tz/src/
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
+mvn-rpmbuild \
-e \
- -Dmaven2.jpp.mode=true \
-Dmaven.test.failure.ignore=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
@@ -127,16 +111,18 @@ rm -rf %{buildroot}
%changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.6.2-4.tzdata2010n
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Fri Apr 15 2011 Chris Spike <spike(a)fedoraproject.org> 1.6.2-4.tzdata2011f
+- New tzdata (2011f)
+- Fixed build for maven 3
+- Cleaned up BRs
-* Wed Oct 27 2010 Chris Spike <chris.spike(a)arcor.de> 1.6.2-3.tzdata2010n
+* Wed Oct 27 2010 Chris Spike <spike(a)fedoraproject.org> 1.6.2-3.tzdata2010n
- New tzdata (2010n)
-* Thu Sep 23 2010 Chris Spike <chris.spike(a)arcor.de> 1.6.2-2.tzdata2010l
+* Thu Sep 23 2010 Chris Spike <spike(a)fedoraproject.org> 1.6.2-2.tzdata2010l
- Ignore test failures (tests fail in koji)
-* Thu Sep 23 2010 Chris Spike <chris.spike(a)arcor.de> 1.6.2-1.tzdata2010l
+* Thu Sep 23 2010 Chris Spike <spike(a)fedoraproject.org> 1.6.2-1.tzdata2010l
- New upstream version (1.6.2)
- Removed dependency on main package for -javadoc subpackage
- Replaced summary with latest version
diff --git a/sources b/sources
index 7532760..a9677a1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
103cb37e0d01c8758bf83d042267409c joda-time-1.6.2-src.tar.gz
-b5eefb4986866895ab84f52220f1dfa6 tzdata2010n.tar.gz
+cc8136284ae1e6c720a18e0f080242e0 tzdata2011f.tar.gz