[relaxngDatatype] Update to version released from new project location rhbz#981275

[Mat Booth]

commit b391d804082287f79101a8cac595261ea005272c
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Oct 21 15:28:24 2014 +0100

    Update to version released from new project location rhbz#981275
    
    - Build/install with maven instead of ant
    - Drop old javadoc rpm bug workaround

 .gitignore                        |    6 +++-
 relaxngDatatype-compressjar.patch |   10 -------
 relaxngDatatype.spec              |   54 ++++++++++++++++--------------------
 sources                           |    4 +-
 4 files changed, 31 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 01489b6..430554c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-relaxngDatatype-1.0.zip
+/copying.txt
+/relaxngDatatype-2011.1.tar.gz
+/noarch/
+/*.src.rpm
+/.build-*.log
diff --git a/relaxngDatatype.spec b/relaxngDatatype.spec
index ba47346..5bb6456 100644
--- a/relaxngDatatype.spec
+++ b/relaxngDatatype.spec
@@ -1,17 +1,15 @@
 Name:           relaxngDatatype
-Version:        1.0
-Release:        12.5%{?dist}
+Version:        2011.1
+Release:        1%{?dist}
 Summary:        RELAX NG Datatype API
 License:        BSD
-URL:            https://sourceforge.net/projects/relaxng
-# wget http://netcologne.dl.sourceforge.net/project/relaxng/datatype%20%28java%29/Ver.%{version}/%{name}-%{version}.zip
-Source0:        http://netcologne.dl.sourceforge.net/project/relaxng/datatype%20%28java%29/Ver.%{version}/%{name}-%{version}.zip
-Source1:        http://repo1.maven.org/maven2/%{name}/%{name}/20020414/%{name}-20020414.pom
-Patch0:         %{name}-compressjar.patch
+URL:            https://github.com/java-schema-utilities/relaxng-datatype-java
+Source0:        https://github.com/java-schema-utilities/relaxng-datatype-java/archive/relaxngDatatype-%{version}.tar.gz
+# License is not available in the tarball, this copy fetched from the tarball on the old sourceforge.net site
+Source1:        copying.txt
 
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  ant >= 0:1.6
+BuildRequires:  maven-local
 
 %description
 RELAX NG is a public space for test cases and other ancillary software
@@ -22,41 +20,37 @@ implementations.
 Summary:        API documentation for %{name}
 
 %description    javadoc
-This package provides %{name}.
+This package provides %{summary}.
 
 %prep
-%setup -q
-%patch0 -p0
-sed -i s/
// copying.txt doc/stylesheet.css
+%setup -q -n relaxng-datatype-java-relaxngDatatype-%{version}
 
-%build
-ant -Dbuild.sysclasspath=only
+cp -p %{SOURCE1} .
 
-%install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/
+%pom_xpath_remove "pom:build/pom:extensions"
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+# For compatibility
+%mvn_alias "com.github.relaxng:relaxngDatatype" "relaxngDatatype:relaxngDatatype"
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%build
+%mvn_build
 
-# Workaround for RPM bug (symlink was changed to directory).
-# TODO: Remove this in F-22
-%pretrans javadoc -p <lua>
-dir = "%{_javadocdir}/%{name}"
-dummy = posix.readlink(dir) and os.remove(dir)
+%install
+%mvn_install
 
 %files -f .mfiles
+%dir %{_javadir}/relaxngDatatype
 %doc copying.txt
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc copying.txt
-%doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 21 2014 Mat Booth <mat.booth at redhat.com> - 2011.1-1
+- Update to version released from new project location rhbz#981275
+- Build/install with maven instead of ant
+- Drop old javadoc rpm bug workaround
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-12.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b5b961d..b7b4950 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d83828aa9f019c81b598e56d2c44c896  relaxngDatatype-1.0.zip
-96c3ef3e74bf45ccfacc9990c617a622  relaxngDatatype-20020414.pom
+591b7a6705fb229b51955400c3660524  copying.txt
+10e60abd16f0ea9ecafb68e8b3422d91  relaxngDatatype-2011.1.tar.gz