[vecmath] Update to 1.6.0, fixing FTBFS.

[Susi Lehtola]

commit 8d6676a7aa7c52bb7bb7d5cfa2f61cf1e7a947a8
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Thu Sep 5 18:34:00 2013 +0300

    Update to 1.6.0, fixing FTBFS.

 vecmath.spec |   62 +++++++++++++++-------------------------------------------
 1 files changed, 16 insertions(+), 46 deletions(-)
---
diff --git a/vecmath.spec b/vecmath.spec
index 513ba07..f2541d5 100644
--- a/vecmath.spec
+++ b/vecmath.spec
@@ -1,24 +1,17 @@
+%global commit 41fddda1a4f430e45bef0154e1fdfe5671025f1e
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name:          vecmath
-Version:       1.5.2
-Release:       3%{?dist}
+Version:       1.6.0
+Release:       0.1.20130710git41fddda%{?dist}
 Summary:       The 3D vector math Java package, javax.vecmath
 Group:         Development/Libraries
 # License is GNU General Public License, version 2, with the Classpath Exception
 License:       GPLv2 with exceptions
-URL:           http://java.net/projects/vecmath
-# svn export https://svn.java.net/svn/vecmath~svn/tags/rel-1_5_2-fcs vecmath-1.5.2/vecmath
-# svn export https://svn.java.net/svn/vecmath-test~svn/tags/rel-1_5_2-fcs vecmath-1.5.2/vecmath-test
-# find vecmath-1.5.2 -name "*.class" -delete
-# find vecmath-1.5.2 -name "*.jar" -delete
-# find vecmath-1.5.2 -name "*.so" -delete
-# find vecmath-1.5.2 -name "unzip*" -delete
-# tar czf vecmath-1.5.2-clean-src-svn.tar.gz vecmath-1.5.2
-Source0:       %{name}-%{version}-clean-src-svn.tar.gz
-# originally taken from http://repo1.maven.org/maven2/java3d/
-Source1:       %{name}-%{version}.pom
+URL:           http://github.com/hharrison/vecmath
+Source0:       https://github.com/hharrison/vecmath/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+# Fix link to javadoc
 Patch0:        %{name}-%{version}-javadoc-link.patch
-Patch1:        %{name}-%{version}-fix-incorrect-fsf-address.patch
-
 BuildArch:     noarch
 
 BuildRequires: ant
@@ -43,54 +36,31 @@ Requires:      jpackage-utils
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q
+%setup -qn %{name}-%{commit}
 %patch0 -p0
-%patch1 -p0
-
-iconv -f iso8859-1 -t utf-8 vecmath/COPYRIGHT.txt > vecmath/COPYRIGHT.txt.conv && mv -f vecmath/COPYRIGHT.txt.conv vecmath/COPYRIGHT.txt
-sed -i 's/\r//' vecmath/COPYRIGHT.txt vecmath/LICENSE.txt
-
-cp -pr vecmath/docs .
-cp -p vecmath/COPYRIGHT.txt .
-cp -p vecmath/LICENSE.txt .
-cp -p vecmath/LICENSE-SPEC.html .
 
 %build
-
-(
-  cd %{name}
-  %ant jar docs
-)
+%ant jar docs
 
 %install
-
-install -D -p -m 644 %{name}/build/opt/lib/ext/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+install -D -p -m 644 build/jars/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -a %{name}/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%check
-(
-  cd %{name}-test
-  export CLASSPATH=$(built-classpath junit)
-  %ant test
-)
+cp -a build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %doc docs/api-changes* COPYRIGHT.txt LICENSE.txt LICENSE-SPEC.html
 %{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %doc COPYRIGHT.txt LICENSE.txt LICENSE-SPEC.html
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 5 2013 Harvey Harrison <harvey.harrison at gmail.com> - 1.6.0-0.1.20130710git41fddda
+- change upstream source to github
+- upgrade to 1.6.0
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild