From 8eaea4b81d23040e0d7c339d7900a4f616154ecf Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 24 Sep 2015 18:35:54 +0200 Subject: [PATCH] build with maven - re-add maven pom (rhbz#1022506) - fix javadoc errors --- .gitignore | 1 + sources | 1 + vecmath-1.6.0-javadoc-link.patch | 12 -------- vecmath-javadoc.patch | 47 ++++++++++++++++++++++++++++++++ vecmath.spec | 38 ++++++++++++++------------ 5 files changed, 69 insertions(+), 30 deletions(-) delete mode 100644 vecmath-1.6.0-javadoc-link.patch create mode 100644 vecmath-javadoc.patch diff --git a/.gitignore b/.gitignore index 8b80371..e7c9fd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vecmath-20090922.tar.bz2 /vecmath-1.6.0-be715bd.tar.gz /vecmath-1.6.0-41fddda.tar.gz +/vecmath-1.5.2.pom diff --git a/sources b/sources index 733ec19..f73b7df 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0a82e273f2d1de1811ff6fa65858388f vecmath-1.6.0-41fddda.tar.gz +dbb569a1b1974289387c7574996b605e vecmath-1.5.2.pom diff --git a/vecmath-1.6.0-javadoc-link.patch b/vecmath-1.6.0-javadoc-link.patch deleted file mode 100644 index 64578f0..0000000 --- a/vecmath-1.6.0-javadoc-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/build.xml b/build.xml -index f33f185..4531b27 100644 ---- build.xml -+++ build.xml -@@ -76,6 +76,7 @@ - packagenames="javax.vecmath.*" - destdir="${javadoc.dir}" - windowtitle="Vecmath ${version_base}"> -+ - - - diff --git a/vecmath-javadoc.patch b/vecmath-javadoc.patch new file mode 100644 index 0000000..994ad8a --- /dev/null +++ b/vecmath-javadoc.patch @@ -0,0 +1,47 @@ +diff -up vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/build.xml.javadoc vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/build.xml +--- vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/build.xml.javadoc 2013-07-10 18:32:13.000000000 +0200 ++++ vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/build.xml 2015-09-24 18:24:14.843127653 +0200 +@@ -76,6 +76,7 @@ + packagenames="javax.vecmath.*" + destdir="${javadoc.dir}" + windowtitle="Vecmath ${version_base}"> ++ + + + +diff -up vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/GVector.java.javadoc vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/GVector.java +--- vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/GVector.java.javadoc 2013-07-10 18:32:13.000000000 +0200 ++++ vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/GVector.java 2015-09-24 18:23:13.080312295 +0200 +@@ -159,7 +159,7 @@ public class GVector implements java.io. + * Constructs a new GVector of the specified length and + * initializes it by copying the specified number of elements from + * the specified array. The array must contain at least +- * length elements (i.e., vector.length >= ++ * length elements (i.e., vector.length ≥ + * length. The length of this new GVector is set to + * the specified length. + * @param vector The array from which the values will be copied. +diff -up vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/Tuple3b.java.javadoc vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/Tuple3b.java +--- vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/Tuple3b.java.javadoc 2013-07-10 18:32:13.000000000 +0200 ++++ vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/Tuple3b.java 2015-09-24 18:23:13.080312295 +0200 +@@ -36,7 +36,7 @@ package javax.vecmath; + * bytes were unsigned. + * Values greater than 127 can be assigned to a byte variable using a + * type cast. For example: +- * ++ * 
byteVariable = (byte) intValue; // intValue can be > 127
+ * If intValue is greater than 127, then byteVariable will be negative. The + * correct value will be extracted when it is used (by masking off the upper + * bits). +diff -up vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/Tuple4b.java.javadoc vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/Tuple4b.java +--- vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/Tuple4b.java.javadoc 2013-07-10 18:32:13.000000000 +0200 ++++ vecmath-41fddda1a4f430e45bef0154e1fdfe5671025f1e/src/javax/vecmath/Tuple4b.java 2015-09-24 18:23:13.081312292 +0200 +@@ -36,7 +36,7 @@ package javax.vecmath; + * bytes were unsigned. + * Values greater than 127 can be assigned to a byte variable using a + * type cast. For example: +- * ++ * 
byteVariable = (byte) intValue; // intValue can be > 127
+ * If intValue is greater than 127, then byteVariable will be negative. The + * correct value will be extracted when it is used (by masking off the upper + * bits). diff --git a/vecmath.spec b/vecmath.spec index 299bb14..a98765d 100644 --- a/vecmath.spec +++ b/vecmath.spec @@ -3,26 +3,26 @@ Name: vecmath Version: 1.6.0 -Release: 0.4.20130710git41fddda%{?dist} +Release: 0.5.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://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 +# missing pom file +# https://bugzilla.redhat.com/show_bug.cgi?id=1022506 +Source1: https://repo1.maven.org/maven2/javax/vecmath/vecmath/1.5.2/vecmath-1.5.2.pom +# Fix link to javadoc and javadoc errors +Patch0: vecmath-javadoc.patch BuildArch: noarch BuildRequires: ant -BuildRequires: ant-junit -BuildRequires: junit BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-javadoc -BuildRequires: jpackage-utils +BuildRequires: javapackages-local Requires: java-headless >= 1:1.6.0 -Requires: jpackage-utils %description The 3D vector math Java package, javax.vecmath. @@ -30,33 +30,35 @@ The 3D vector math Java package, javax.vecmath. %package javadoc Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc This package contains javadoc for %{name}. %prep %setup -qn %{name}-%{commit} -%patch0 -p0 +%patch0 -p1 +sed -e "s|1.5.2|1.6.0|" %{SOURCE1} > %{name}.pom +%mvn_file javax.vecmath:vecmath %{name} %build -%ant jar docs +%ant %install -install -D -p -m 644 build/jars/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar +%mvn_artifact %{name}.pom build/jars/%{name}.jar +%mvn_install -J build/javadoc -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -a build/javadoc/* %{buildroot}%{_javadocdir}/%{name} - -%files +%files -f .mfiles %doc docs/api-changes* COPYRIGHT.txt LICENSE.txt LICENSE-SPEC.html -%{_javadir}/%{name}.jar -%files javadoc +%files javadoc -f .mfiles-javadoc %doc COPYRIGHT.txt LICENSE.txt LICENSE-SPEC.html -%{_javadocdir}/%{name} %changelog +* Thu Sep 24 2015 Dominik 'Rathann' Mierzejewski - 1.6.0-0.5.20130710git41fddda +- build with maven +- re-add maven pom (rhbz#1022506) +- fix javadoc errors + * Fri Jun 19 2015 Fedora Release Engineering - 1.6.0-0.4.20130710git41fddda - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild