From 9a83bea2bf626cd9c8c0082207953cbf156cd346 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Jun 04 2013 14:16:42 +0000
Subject: Enable testsuite


- Update to lates packaging guidelines

---

diff --git a/joda-time.spec b/joda-time.spec
index 44271de..f2f195a 100644
--- a/joda-time.spec
+++ b/joda-time.spec
@@ -2,10 +2,9 @@
 
 Name:             joda-time
 Version:          2.1
-Release:          4.%{tzversion}%{?dist}
+Release:          5.%{tzversion}%{?dist}
 Summary:          Java date and time API
 
-Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://joda-time.sourceforge.net
 Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}-dist.tar.gz
@@ -13,28 +12,21 @@ Source1:          ftp://ftp.iana.org/tz/releases/%{tzversion}.tar.gz
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
 BuildRequires:    maven-local
 BuildRequires:    joda-convert
 
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
-Requires:         joda-convert
 
 %description
 Joda-Time provides a quality replacement for the Java date and time classes. The
 design allows for multiple calendar systems, while still providing a simple API.
-The 'default' calendar is the ISO8601 standard which is used by XML. The 
-Gregorian, Julian, Buddhist, Coptic, Ethiopic and Islamic systems are also 
-included, and we welcome further additions. Supporting classes include time 
-zone, duration, format and parsing. 
+The 'default' calendar is the ISO8601 standard which is used by XML. The
+Gregorian, Julian, Buddhist, Coptic, Ethiopic and Islamic systems are also
+included, and we welcome further additions. Supporting classes include time
+zone, duration, format and parsing.
 
 
 %package javadoc
 Summary:          Javadoc for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
-
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -53,38 +45,25 @@ find . -name '*.jar' -exec rm -f '{}' \;
 rm -f src/main/java/org/joda/time/tz/src/*
 tar -xzf %{SOURCE1} -C src/main/java/org/joda/time/tz/src/
 
+%mvn_file : %{name}
 
 %build
-mvn-rpmbuild \
-        -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
-
+%mvn_build
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt RELEASE-NOTES.txt ToDo.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun  4 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.1-5.tzdata2012h
+- Enable testsuite
+- Update to lates packaging guidelines
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-4.tzdata2012h
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild