build with maven
- re-add maven pom (rhbz#1022506) - fix javadoc errors
This commit is contained in:
parent
987851cef2
commit
8eaea4b81d
5 changed files with 69 additions and 30 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
1
sources
1
sources
|
|
@ -1 +1,2 @@
|
|||
0a82e273f2d1de1811ff6fa65858388f vecmath-1.6.0-41fddda.tar.gz
|
||||
dbb569a1b1974289387c7574996b605e vecmath-1.5.2.pom
|
||||
|
|
|
|||
|
|
@ -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}">
|
||||
+ <link href="/usr/share/javadoc/java/" />
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
47
vecmath-javadoc.patch
Normal file
47
vecmath-javadoc.patch
Normal file
|
|
@ -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}">
|
||||
+ <link href="/usr/share/javadoc/vecmath/" />
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
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
|
||||
- * <code>length</code> elements (i.e., <code>vector.length</code> >=
|
||||
+ * <code>length</code> elements (i.e., <code>vector.length</code> ≥
|
||||
* <code>length</code>. 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:
|
||||
- * <ul>byteVariable = (byte) intValue; // intValue can be > 127</ul>
|
||||
+ * <pre><code>byteVariable = (byte) intValue; // intValue can be > 127</code></pre>
|
||||
* 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:
|
||||
- * <ul>byteVariable = (byte) intValue; // intValue can be > 127</ul>
|
||||
+ * <pre><code>byteVariable = (byte) intValue; // intValue can be > 127</code></pre>
|
||||
* 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).
|
||||
38
vecmath.spec
38
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|<version>1.5.2</version>|<version>1.6.0</version>|" %{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 <rpm@greysector.net> - 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 <rel-eng@lists.fedoraproject.org> - 1.6.0-0.4.20130710git41fddda
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Reference in a new issue