diff --git a/.gitignore b/.gitignore index fc3fb7e..6bf3b8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -uqm-0.6.2-source.tgz -/uqm-0.7.0-source.tgz +/uqm-*-src.tgz diff --git a/sources b/sources index 6b1e23e..ebcbb76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9018ea0493d7dac6a9e1006b00af7df uqm-0.7.0-source.tgz +SHA512 (uqm-0.8.0-src.tgz) = 7e964aaccd69e2d775f9e5f42a01b40b2b6d9188741330e56ecaf3888a664b33aa4271418081b7a9193a093e9fa466c947e08a6931c6b91797005a0093f19217 diff --git a/uqm-optflags.patch b/uqm-optflags.patch index 81d7970..a3358f2 100644 --- a/uqm-optflags.patch +++ b/uqm-optflags.patch @@ -1,15 +1,15 @@ --- build/unix/build.config~ 2011-07-04 12:45:34.000000000 -0400 +++ build/unix/build.config 2011-11-04 16:14:47.645731689 -0400 -@@ -117,7 +117,7 @@ - CFLAGS="$CFLAGS -O3 -DNDEBUG" +@@ -135,7 +135,7 @@ + CCOMMONFLAGS="$CCOMMONFLAGS -O3 -DNDEBUG" ;; *) -- CFLAGS="$CFLAGS -O3 -DNDEBUG" -+ CFLAGS="$CFLAGS $RPM_OPT_FLAGS" +- CCOMMONFLAGS="$CCOMMONFLAGS -O3 -DNDEBUG" ++ CCOMMONFLAGS="$CCOMMONFLAGS $RPM_OPT_FLAGS" ;; esac DEBUG=0 -@@ -189,7 +189,7 @@ +@@ -213,7 +213,7 @@ CHOICE_debug_DEFAULT=nodebug ;; *) diff --git a/uqm.autodlrc b/uqm.autodlrc index 2ffbf20..984859b 100644 --- a/uqm.autodlrc +++ b/uqm.autodlrc @@ -52,33 +52,33 @@ http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode [FILELIST] [FILE] - [FILENAME]uqm-0.7.0-content.uqm[/FILENAME] - [MD5]2f36dcb15274dbbcb5e266f2ed84d5b2[/MD5] + [FILENAME]uqm-0.8.0-content.uqm[/FILENAME] + [MD5]6cbc9d51fa63e07c0f4d1d061136d816[/MD5] [PATH]$HOME/.uqm/content/packages[/PATH] [MIRRORS] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-content.uqm/download[/URL] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-content.uqm/download[/URL] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-content.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-content.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-content.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-content.uqm/download[/URL] [/MIRRORS] [/FILE] [FILE] - [FILENAME]uqm-0.7.0-voice.uqm[/FILENAME] - [MD5]b78e0606325810f9f2e9ec786191c01b[/MD5] + [FILENAME]uqm-0.8.0-voice.uqm[/FILENAME] + [MD5]fc89f77d7b66c2669abca6c157f5259a[/MD5] [PATH]$HOME/.uqm/content/addons[/PATH] [MIRRORS] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-voice.uqm/download[/URL] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-voice.uqm/download[/URL] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-voice.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-voice.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-voice.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-voice.uqm/download[/URL] [/MIRRORS] [/FILE] [FILE] - [FILENAME]uqm-0.7.0-3domusic.uqm[/FILENAME] - [MD5]86a5e376d9b76888add1d10818f0ab9f[/MD5] + [FILENAME]uqm-0.8.0-3domusic.uqm[/FILENAME] + [MD5]9e5801d45ca12028b486cdeb83568c02[/MD5] [PATH]$HOME/.uqm/content/addons[/PATH] [MIRRORS] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-3domusic.uqm/download[/URL] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-3domusic.uqm/download[/URL] - [URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-3domusic.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-3domusic.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-3domusic.uqm/download[/URL] + [URL]https://sourceforge.net/projects/sc2/files/UQM/0.8/uqm-0.8.0-3domusic.uqm/download[/URL] [/MIRRORS] [/FILE] [FILE] @@ -105,6 +105,14 @@ http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode [URL]http://prdownloads.sourceforge.net/sc2/uqm-remix-disc3.uqm?download[/URL] [/MIRRORS] [/FILE] +[FILE] + [FILENAME]uqm-remix-pack4-1.uqm[/FILENAME] + [MD5]3fb63f4ac514343ed4b4b5b194c413fb[/MD5] + [PATH]$HOME/.uqm/content/addons[/PATH] + [MIRRORS] + [URL]http://prdownloads.sourceforge.net/sc2/uqm-remix-disc4-1.uqm?download[/URL] + [/MIRRORS] +[/FILE] diff --git a/uqm.spec b/uqm.spec index b662b24..7733c45 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,19 +1,20 @@ Name: uqm -Version: 0.7.0 -Release: 12%{?dist} +Version: 0.8.0 +Release: 7%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II -Group: Amusements/Games -License: GPLv2+ +# Upstream claims everything to be under GPL-2.0-or-later. +# In reality, the source contains many files copied from other projects, +# with a variety of open source licenses. +License: GPL-2.0-or-later AND GPL-2.0-only AND LGPL-2.1-or-later AND Zlib URL: http://sc2.sourceforge.net/ -Source0: http://download.sf.net/sc2/%{name}-%{version}-source.tgz +Source0: http://download.sf.net/sc2/%{name}-%{version}-src.tgz Source1: %{name}.conf Source2: %{name}.sh Source3: %{name}.desktop Source4: %{name}-functions.sh Source5: %{name}.autodlrc Patch0: %{name}-optflags.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.8 BuildRequires: SDL_image-devel >= 1.2.4 @@ -23,6 +24,8 @@ BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: libGLU-devel BuildRequires: libmikmod-devel +BuildRequires: libpng-devel +BuildRequires: gcc Requires: autodownloader Provides: uqm-content = %{version}-%{release} Provides: uqm-content-3domusic = %{version}-%{release} @@ -40,10 +43,9 @@ version of Star Control II, with their permission and encouragement. %prep -%setup -q +%setup -qn uqm-0.8.0 find -type d -name CVS -exec rm -rf {} ';' -%patch0 -p0 - +%patch -P0 -p0 %build echo INPUT_install_sharedir_VALUE=%{_datadir} > config.state @@ -53,7 +55,6 @@ convert src/res/ur-quan-icon-std.ico uqm.png %install -rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}} sed -e 's|/etc/|%{_sysconfdir}/|' %{SOURCE1} > \ @@ -113,13 +114,9 @@ SentUpstream: 2014-09-25 EOF -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog Contributing COPYING README +%license COPYING +%doc AUTHORS ChangeLog Contributing README %doc WhatsNew doc/users/manual.txt %config(noreplace) %{_sysconfdir}/uqm.conf %{_bindir}/uqm @@ -131,6 +128,72 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 0.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 0.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 03 2023 Otto Liljalaakso - 0.8.0-2 +- License review, migrate to SPDX license ids + +* Sat Jan 28 2023 Otto Liljalaakso - 0.8.0-1 +- Update to 0.8.0 + +* Sat Jan 21 2023 Fedora Release Engineering - 0.7.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.7.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.7.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.7.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.7.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.7.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.7.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.7.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.7.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.7.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.7.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 23 2018 Gwyn Ciesla - 0.7.0-16 +- Updated upstream. + +* Tue Jan 23 2018 Gwyn Ciesla - 0.7.0-15 +- Rename internal strings.h to fix FTBFS. + +* Thu Aug 03 2017 Fedora Release Engineering - 0.7.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.7.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.7.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild