diff --git a/vecmath1.2-1.14-javac-1.8.patch b/vecmath1.2-1.14-javac-1.8.patch deleted file mode 100644 index d8454e6..0000000 --- a/vecmath1.2-1.14-javac-1.8.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Makefile.unix b/Makefile.unix -index 1964270..335dabc 100644 ---- a/Makefile.unix -+++ b/Makefile.unix -@@ -57,12 +57,12 @@ all: classdir $(CLASSFILES) - - build: - export CLASSPATH; CLASSPATH=$(CLASSPATH):.; \ -- javac -deprecation -g -d $(CLASSDIR) $(JAVA_SOURCEFILES) -+ javac -source 1.8 -target 1.8 -deprecation -g -d $(CLASSDIR) $(JAVA_SOURCEFILES) - - - $(CLASSDIR)/%.class: %.java - export CLASSPATH; CLASSPATH=$(CLASSPATH):.; \ -- javac -deprecation -g -d $(CLASSDIR) $< -+ javac -source 1.8 -target 1.8 -deprecation -g -d $(CLASSDIR) $< - - $(PCDIR)/%.java: %.java - sed 's/$/\015/' $< > $@ -@@ -76,7 +76,7 @@ docs: FORCE - mkdir -p docs; \ - fi - export CLASSPATH; CLASSPATH=$(CLASSPATH):.; \ -- javadoc -d docs javax.vecmath -+ javadoc -source 1.8 -d docs javax.vecmath - - test: - export CLASSPATH; CLASSPATH=$(CLASSPATH):.; \ diff --git a/vecmath1.2.rpmlintrc b/vecmath1.2.rpmlintrc deleted file mode 100644 index ae4ac7e..0000000 --- a/vecmath1.2.rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("spelling-error") diff --git a/vecmath1.2.spec b/vecmath1.2.spec index 3c6237e..75f65e5 100644 --- a/vecmath1.2.spec +++ b/vecmath1.2.spec @@ -1,18 +1,17 @@ Name: vecmath1.2 Version: 1.14 -Release: 42%{?dist} +Release: 19%{?dist} Summary: Free version of vecmath from the Java3D 1.2 specification +Group: System Environment/Libraries License: MIT URL: http://www.objectclub.jp/download/vecmath_e Source0: http://www.objectclub.jp/download/files/vecmath//%{name}-%{version}.tar.gz Patch0: vecmath1.2-1.14-javadoc-fixes.patch -Patch1: vecmath1.2-1.14-javac-1.8.patch BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -BuildRequires: make -BuildRequires: java-25-devel >= 1:1.6.0 -Requires: java-25-headless >= 1:1.6.0 -Requires: javapackages-filesystem +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +Requires: jpackage-utils +Requires: java-headless >= 1:1.6.0 # Necessary due to architecture change to noarch Obsoletes: %{name} < %{version}-%{release} @@ -26,7 +25,9 @@ Generic matrices' LU and SV decomposition are also there. %package javadoc +Group: Development/Libraries Summary: Javadoc for %{name} +Requires: %{name} = %{version}-%{release} # Necessary due to architecture change to noarch Obsoletes: %{name}-javadoc < %{version}-%{release} @@ -36,8 +37,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 +%patch0 -p1 find -name *.jar -delete find -name *.class -delete @@ -67,76 +67,6 @@ cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/ %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.14-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.14-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Mon Jul 28 2025 jiri vanek - 1.14-40 -- Rebuilt for java-25-openjdk as preffered jdk - -* Fri Jul 25 2025 Fedora Release Engineering - 1.14-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.14-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.14-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1.14-36 -- Rebuilt for java-21-openjdk as system jdk - -* Sat Jan 27 2024 Fedora Release Engineering - 1.14-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.14-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.14-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.14-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 1.14-31 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 1.14-30 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 1.14-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.14-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.14-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.14-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 21 2020 Fabio Valentini - 1.14-25 -- Set javac source / target version to 1.8 to fix issues on Java 11. - -* Sat Jul 11 2020 Jiri Vanek - 1.14-24 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.14-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Aug 17 2019 Hans de Goede - 1.14-22 -- Drop obsolete [Build]Requires: jpackage-utils -- Drop -javadoc sub-package Requires on the main package - -* Sat Jul 27 2019 Fedora Release Engineering - 1.14-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.14-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Sat Jul 14 2018 Fedora Release Engineering - 1.14-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild