[json-lib] Update to maven2, fixing FTBFS

[Andy Grimm]

commit 16fbc46259b021aab53f9a7e8f19695581e48a14
Author: Andy Grimm <agrimm at gmail.com>
Date:   Sat Aug 11 10:20:23 2012 -0400

    Update to maven2, fixing FTBFS

 json-lib.spec |   54 +++++++++++-------------------------------------------
 1 files changed, 11 insertions(+), 43 deletions(-)
---
diff --git a/json-lib.spec b/json-lib.spec
index 25bd80b..d547c53 100644
--- a/json-lib.spec
+++ b/json-lib.spec
@@ -1,9 +1,7 @@
 Name:           json-lib
 Version:        2.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        JSON library for Java
-
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://json-lib.sourceforge.net/
 # A plain jarball with the source is provided by upstream.  We could use
@@ -14,7 +12,6 @@ URL:            http://json-lib.sourceforge.net/
 # tar czf json-lib-2.3.tar.gz --exclude CVS json-lib-2.3
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         json-lib-2.3-pom.patch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
@@ -23,12 +20,9 @@ BuildRequires:  asm2
 BuildRequires:  ezmorph
 BuildRequires:  groovy >= 1.7.2-2
 BuildRequires:  jakarta-oro
-BuildRequires:  junit4
+BuildRequires:  junit
 BuildRequires:  log4j
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-javadoc-plugin
@@ -45,39 +39,28 @@ BuildArch:      noarch
 JSON-lib is a java library for transforming beans, maps, collections, java
 arrays and XML to JSON and back again to beans and DynaBeans.
 
-
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
 Requires:       %{name} = %{version}
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .pom
 
-
 %build
 # Not strictly needed, but it makes no harm to be on the safe side
 find -name '*.jar' -o -name '*.class' -delete
 
-MAVEN_REPO_LOCAL=$PWD/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
-
+mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Code
 install -d $RPM_BUILD_ROOT%{_javadir}
-install -m644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # Documentation
 install -d $RPM_BUILD_ROOT%{_javadocdir}
@@ -86,35 +69,20 @@ cp -ap target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # Maven
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap net.sf.json-lib %{name} %{version} JPP %{name}
-
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-%update_maven_depmap
-
-
-%postun
-%update_maven_depmap
-
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*
 
-
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/*
-
+%{_javadocdir}/%{name}
 
 %changelog
+* Fri Aug 10 2012 Andy Grimm <agrimm at gmail.com> - 2.3-8
+- Update to maven2, fixing FTBFS
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild