diff --git a/colossus.spec b/colossus.spec index 1413eee..0005e98 100644 --- a/colossus.spec +++ b/colossus.spec @@ -3,11 +3,11 @@ Name: colossus %global revdate 20130917 Version: 0.14.0 %global branch %{nil} -Release: 32%{?dist} +Release: 6%{?dist} Summary: Allows people to play Titan against each other or AIs -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +Group: Amusements/Games +License: GPLv2 URL: http://colossus.sourceforge.net/ # The svn repo includes some prebuilt jar files that need to be removed @@ -23,18 +23,18 @@ Source1: colossus-gen-tarball.sh Source2: colossus-rev.xsl BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Note the intention is to eventually require only java 1.5 for both building # and installing. But bug 510243 in gjdoc currently blocks this. -BuildRequires: java-25-devel +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils -BuildRequires: ant-openjdk25 +BuildRequires: ant BuildRequires: jdom BuildRequires: desktop-file-utils BuildRequires: zip -Requires: java-25 +Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires: jdom Requires(post): coreutils @@ -48,6 +48,7 @@ of humans. %package javadoc Summary: Javadocs for %{name} +Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils @@ -59,15 +60,8 @@ This package contains the API documentation for %{name}. %build -# Create file for local build properties -cp /dev/null local_build.properties - # Tell colossus' build process where to look for needed jar files -echo "libs.dir=%{_javadir}" >> local_build.properties - -# Override 1.5 requirement to work with Java 11 -echo "source.level=1.8" >> local_build.properties -echo "target.level=1.8" >> local_build.properties +echo "libs.dir=%{_javadir}" > local_build.properties # Tell colossus some build info that the game will display mkdir -p build/ant/classes/META-INF @@ -169,7 +163,19 @@ SentUpstream: 2014-09-24 EOF +%clean +rm -rf $RPM_BUILD_ROOT + +%post +touch --no-create %{_datadir}/pixmaps || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/pixmaps || : + +%postun +touch --no-create %{_datadir}/pixmaps || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/pixmaps || : + %files +%defattr(-,root,root,-) %{_javadir}/* %{_bindir}/* %{_datadir}/pixmaps/* @@ -178,87 +184,10 @@ EOF %doc docs/* %files javadoc +%defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog -* Mon Jul 28 2025 jiri vanek - 0.14.0-32 -- Rebuilt for java-25-openjdk as preffered jdk - -* Wed Jul 23 2025 Fedora Release Engineering - 0.14.0-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0.14.0-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jul 29 2024 Miroslav Suchý - 0.14.0-29 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 0.14.0-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 0.14.0-27 -- Rebuilt for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 0.14.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.14.0-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.14.0-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.14.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 0.14.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 0.14.0-21 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 0.14.0-20 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 0.14.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.14.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.14.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.14.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 0.14.0-15 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Sun May 03 2020 Bruno Wolff III - 0.14.0-14 -- New Fedora release that is hoped will work with java 11 - -* Tue Jan 28 2020 Fedora Release Engineering - 0.14.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 0.14.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.14.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 0.14.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.14.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 07 2018 Igor Gnatenko - 0.14.0-8 -- Remove obsolete scriptlets - -* Wed Jul 26 2017 Fedora Release Engineering - 0.14.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Fri Feb 10 2017 Fedora Release Engineering - 0.14.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild