[jnr-netdb] Updated to version 1.1.1.

[Bohuslav Kabrda]

commit 5a35cb7dfa6f7c05072a20d735be51e5d895775b
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Tue Feb 5 13:17:35 2013 +0100

    Updated to version 1.1.1.

 .gitignore                           |    1 +
 fix_jnr_netdb_jar_dependencies.patch |  127 ----------------------------------
 jnr-netdb.spec                       |   69 ++++++++++---------
 sources                              |    2 +-
 4 files changed, 38 insertions(+), 161 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a7610d..fe05ae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /wmeissner-jnr-netdb-6e04bca.tar.gz
+/jnr-jnr-netdb-1.1.1-0-g483bad4.tar.gz
diff --git a/jnr-netdb.spec b/jnr-netdb.spec
index 8f340ea..44c0450 100644
--- a/jnr-netdb.spec
+++ b/jnr-netdb.spec
@@ -1,29 +1,36 @@
-%global git_commit 6e04bca
-%global cluster    wmeissner
+%global commit_hash 483bad4
+%global tag_hash b9ee256
 
 Name:    jnr-netdb
-Version: 1.0.1
-Release: 7%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 Summary: Network services database access for java
 
 Group:   System Environment/Libraries
-License: LGPLv3
-URL:      http://github.com/%{cluster}/%{name}
-Source0:  %{url}/tarball/%{version}/%{cluster}-%{name}-%{git_commit}.tar.gz
-Patch0:  fix_jnr_netdb_jar_dependencies.patch
+License: ASL 2.0
+URL:     http://github.com/jnr/%{name}/
+Source0: https://github.com/jnr/%{name}/tarball/%{version}/jnr-%{name}-%{version}-0-g%{commit_hash}.tar.gz
 BuildArch: noarch
 
-BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: java-devel
 BuildRequires: jpackage-utils
-BuildRequires: ant
-BuildRequires: ant-nodeps
-BuildRequires: jaffl
-BuildRequires: ant-junit
+BuildRequires: jnr-ffi
 BuildRequires: junit4
 BuildRequires: jffi
-Requires: java >= 1:1.6.0
+
+BuildRequires:  maven-local
+BuildRequires:  maven-clean-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-dependency-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit4
+
+Requires: java
 Requires: jpackage-utils
-Requires: jaffl
+Requires: jnr-ffi
 
 %description
 jnr-netdb is a java interface to getservbyname(3), getservbyport(3)
@@ -31,50 +38,46 @@ jnr-netdb is a java interface to getservbyname(3), getservbyport(3)
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
 
 %description    javadoc
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{cluster}-%{name}-%{git_commit}
-%patch0
+%setup -q -n jnr-%{name}-%{tag_hash}
 
 find ./ -name '*.jar' -exec rm -f '{}' \; 
 find ./ -name '*.class' -exec rm -f '{}' \; 
 
 %build
-build-jar-repository -s -p lib junit junit4 jaffl objectweb-asm jffi
-
-ant jar javadoc
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-# javadoc
-install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -a dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-# pom
-%add_to_maven_depmap org.jruby.extras %{name} %{version} JPP %{name}
-mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-cp pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jnr-netdb.pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml  \
+        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
-%check
-ant test
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
+%doc LICENSE README
 %{_javadir}/*
-%doc COPYING
-%doc COPYING.LESSER
 %{_mavendepmapfragdir}/%{name}
 %{_mavenpomdir}/*
 
 %files javadoc
+%doc LICENSE
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Feb 05 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 1.1.1-1
+- Updated to version 1.1.1.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 8da5206..2c885a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df569be1d131cee267443886ad1c6ca9  wmeissner-jnr-netdb-6e04bca.tar.gz
+b06c377793b5b839d2e8169dbd205309  jnr-jnr-netdb-1.1.1-0-g483bad4.tar.gz