From dae0c1a1b857552bc6046956ece64e4768a15e3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:44:48 +0000 Subject: [PATCH 01/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index 5a3d7a1..a83da49 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.7.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II License: GPLv2+ @@ -124,6 +124,9 @@ EOF %changelog +* 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 From 8d3378a997696be9a7254a466e2132fcd1a6c946 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:07:15 +0000 Subject: [PATCH 02/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index a83da49..b4d6aa9 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.7.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II License: GPLv2+ @@ -124,6 +124,9 @@ EOF %changelog +* 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 From f5fe3b886371ed0e18691669bdcaf490d3e7e2cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:36:17 +0000 Subject: [PATCH 03/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index b4d6aa9..7ce63ec 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.7.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II License: GPLv2+ @@ -124,6 +124,9 @@ EOF %changelog +* 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 From edf241a52d0c8cc073d35ba14331623fa09a5e19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:29:07 +0000 Subject: [PATCH 04/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index 7ce63ec..bf3da94 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.7.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II License: GPLv2+ @@ -124,6 +124,9 @@ EOF %changelog +* 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 From e612672352626ea2638109a08c9cadd5cd5df95f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:54:14 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index bf3da94..be289a6 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.7.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II License: GPLv2+ @@ -124,6 +124,9 @@ EOF %changelog +* 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 From 6de99dd3b459a14e5e22db9f8bbcc16530b1d0a3 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Sun, 29 Jan 2023 00:28:22 +0900 Subject: [PATCH 06/13] Update to 0.8.0 Signed-off-by: Otto Liljalaakso --- .gitignore | 4 +--- sources | 2 +- uqm-optflags.patch | 10 +++++----- uqm.autodlrc | 38 +++++++++++++++++++++++--------------- uqm.spec | 12 ++++++++---- 5 files changed, 38 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index b553141..6bf3b8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -uqm-0.6.2-source.tgz -/uqm-0.7.0-source.tgz -/uqm-0.7.0-1-source.tgz +/uqm-*-src.tgz diff --git a/sources b/sources index 731aac3..ebcbb76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uqm-0.7.0-1-source.tgz) = 77255e7e4cc195d4db7f02bb95e76d41c0d72cb179b30a8cd944c4c78560485d76ad89b0bbd03102e5718d66f3b16050ef73a30b6bc8d31e1c0bfa46758badaa +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 be289a6..7e37e83 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,11 +1,11 @@ Name: uqm -Version: 0.7.0 -Release: 27%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II License: GPLv2+ URL: http://sc2.sourceforge.net/ -Source0: http://download.sf.net/sc2/%{name}-%{version}-1-source.tgz +Source0: http://download.sf.net/sc2/%{name}-%{version}-src.tgz Source1: %{name}.conf Source2: %{name}.sh Source3: %{name}.desktop @@ -21,6 +21,7 @@ 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} @@ -39,7 +40,7 @@ version of Star Control II, with their permission and encouragement. %prep -%setup -qn uqm-0.7.0-1 +%setup -qn uqm-0.8.0 find -type d -name CVS -exec rm -rf {} ';' %patch0 -p0 @@ -124,6 +125,9 @@ EOF %changelog +* 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 From 26503eb62cb19db65627c824a5ee66b2845be2ab Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Fri, 3 Mar 2023 09:15:43 +0200 Subject: [PATCH 07/13] License review, migrate to SPDX license ids --- uqm.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/uqm.spec b/uqm.spec index 7e37e83..3f743bd 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,9 +1,12 @@ Name: uqm Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II -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}-src.tgz Source1: %{name}.conf @@ -125,6 +128,9 @@ EOF %changelog +* 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 From 3737e04c164281a8c4a8ea9f85dfcf5a95a98d8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:12:16 +0000 Subject: [PATCH 08/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index 3f743bd..dfe4238 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II # Upstream claims everything to be under GPL-2.0-or-later. @@ -128,6 +128,9 @@ EOF %changelog +* 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 From f461b9a6f5cbbc3328e2e98b2a62caf79189c20b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:12:03 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index dfe4238..af8c13b 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II # Upstream claims everything to be under GPL-2.0-or-later. @@ -128,6 +128,9 @@ EOF %changelog +* 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 From f45e23ccd3dcac3764cc0710529d09637767eb40 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 10/13] Eliminate use of obsolete %patchN syntax (#2283636) --- uqm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index af8c13b..fb4e2e7 100644 --- a/uqm.spec +++ b/uqm.spec @@ -45,7 +45,7 @@ version of Star Control II, with their permission and encouragement. %prep %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 From ee0aac2744738a21da5e6f4255ad30f871586cea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:21:15 +0000 Subject: [PATCH 11/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index fb4e2e7..9a7ba7b 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II # Upstream claims everything to be under GPL-2.0-or-later. @@ -128,6 +128,9 @@ EOF %changelog +* 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 From 117318d468bb71780fa0904082d41a7b3f5f9122 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:51:46 +0000 Subject: [PATCH 12/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index 9a7ba7b..3ec7a08 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II # Upstream claims everything to be under GPL-2.0-or-later. @@ -128,6 +128,9 @@ EOF %changelog +* 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 From a61d1c6f32920d7f2d2ee53fb461be66e567ece5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:50:17 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uqm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm.spec b/uqm.spec index 3ec7a08..7733c45 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,6 +1,6 @@ Name: uqm Version: 0.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II # Upstream claims everything to be under GPL-2.0-or-later. @@ -128,6 +128,9 @@ EOF %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