From 43158fa22fc454ae7a4d5f75e50b5acbcaa69966 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:18:09 +0000 Subject: [PATCH 01/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 1a1d641..7fdb260 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -153,6 +153,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.14.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Oct 20 2015 Ding-Yi Chen 2.14.5-10 - music won't get uninstall when upgrading. - Remove /usr/share/doc/COPYING as it is already installed. From b16d80e397c1a5db6e1d05c80a2c10ab4f547e7b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 7 Mar 2016 19:18:34 -0600 Subject: [PATCH 02/28] Build with -fsigned-char to fix FTBFS with GCC 6 (#1306226) --- 7kaa.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 7fdb260..cc38e9a 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -58,6 +58,8 @@ Due to license issue, you need to run 7kaa-data-installer install the music. %patch0 -p0 -b .formatSecurity %build +# https://bugzilla.redhat.com/show_bug.cgi?id=1306226 +export CXXFLAGS="%{optflags} -fsigned-char" %configure make %{?_smp_mflags} convert data/image/7k_icon.bmp %{icon_file} @@ -153,6 +155,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Mon Mar 07 2016 Yaakov Selkowitz - 2.14.5-12 +- Build with -fsigned-char to fix FTBFS with GCC 6 (#1306226) + * Wed Feb 03 2016 Fedora Release Engineering - 2.14.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b94e190ff862a5cd09582eef154a0fb83b5c55c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 04:58:00 +0000 Subject: [PATCH 03/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index cc38e9a..dcfdcf6 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -155,6 +155,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.14.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Mar 07 2016 Yaakov Selkowitz - 2.14.5-12 - Build with -fsigned-char to fix FTBFS with GCC 6 (#1306226) From 4456d99b3e1670a7acce0a12b1bc0205bf525a13 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 1 Mar 2017 16:05:41 +1000 Subject: [PATCH 04/28] Upstream update to 2.14.6 --- .gitignore | 1 + 7kaa.spec | 17 +++++++++-------- sources | 5 ++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 95680f7..35bebfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /7kaa-2.14.5.tar.xz /7kaa-formatSecurity.patch /7kaa.autodlrc +/7kaa-2.14.6.tar.xz diff --git a/7kaa.spec b/7kaa.spec index dcfdcf6..b1455da 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,15 +1,14 @@ %global icon_file 7kaa_icon.png %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps -Name: 7kaa -Version: 2.14.5 -Release: 13%{?dist} +Name: 7kaa +Version: 2.14.6 +Release: 1%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ -URL: http://7kfans.com/ +URL: http://7kfans.com/ Source0: http://sourceforge.net/projects/skfans/files/%{name}-%{version}.tar.xz Source1: %{name}.autodlrc -Patch0: http://sf.net/p/skfans/bugs/4/attachment/%{name}-formatSecurity.patch BuildRequires: SDL2-devel, SDL2_net-devel BuildRequires: enet-devel @@ -24,12 +23,12 @@ Seven Kingdoms is a real-time strategy (RTS) computer game developed by Trevor Chan of Enlight Software. The game enables players to compete against up to six other kingdoms allowing players to conquer opponents by defeating them in war (with troops or machines), -capturing their buildings with spies, or offering opponents money +capturing their buildings with spies, or offering opponents money for their kingdom. Seven Kingdoms: Ancient Adversaries is a free patch provided by Interactive Magic and added three new cultures, the Egyptians, the -Mughals and the Zulus, and a new war machine, Unicorn. +Mughals and the Zulus, and a new war machine, Unicorn. %package data BuildArch: noarch @@ -55,7 +54,6 @@ Due to license issue, you need to run 7kaa-data-installer install the music. %prep %setup -q -%patch0 -p0 -b .formatSecurity %build # https://bugzilla.redhat.com/show_bug.cgi?id=1306226 @@ -155,6 +153,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Wed Mar 01 2017 Ding-Yi Chen 2.14.6-1 +- Upstream update to 2.14.6 + * Fri Feb 10 2017 Fedora Release Engineering - 2.14.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index fbfcc4e..8a46102 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -83152b21973c1b3df8de525bda434be4 7kaa-2.14.5.tar.xz -77c36c99a387bf86d311d5a784395119 7kaa-formatSecurity.patch -b865aaf5c8101e7b00e4ef9e7961c1cd 7kaa.autodlrc +SHA512 (7kaa-2.14.6.tar.xz) = 845ce121957959b122a29173b2c52fa6d93a62b25b90f623e683f340d3ab52fc12cc64ef40d866ae44d9de27b5b0028d23c7437ff3b7026edf3879883492e27e +SHA512 (7kaa.autodlrc) = 9ae5ca2bdb77c49114490996eeebbced45283f938d9cc330a381bba1e3a26ffdabd899925a88f11d1f2fc7616afbd3951853b1e3b72399f9bc9b2b20149a8bdd From 54cbaae6aab52b24651835141609ad9717fb2510 Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Sat, 11 Mar 2017 11:43:55 +0100 Subject: [PATCH 05/28] rebuilt due to branching --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index b1455da..ba906ef 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -153,6 +153,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Sat Mar 11 2017 Raphael Groner - 2.14.6-2 +- rebuilt due to branching + * Wed Mar 01 2017 Ding-Yi Chen 2.14.6-1 - Upstream update to 2.14.6 From e9e5dc466cfe0c544a3064fc1f721a6201f7b8ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 01:37:49 +0000 Subject: [PATCH 06/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index ba906ef..27ec00d 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -153,6 +153,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.14.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Mar 11 2017 Raphael Groner - 2.14.6-2 - rebuilt due to branching From 0c212a491ca79ffc36c7f7a5cc5156e00a128232 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 16:46:10 +0000 Subject: [PATCH 07/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 27ec00d..bb25a97 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -153,6 +153,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.14.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.14.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a3c021322ff57840058dfe088b1b214dac11fdfd Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Fri, 8 Dec 2017 01:17:38 +1000 Subject: [PATCH 08/28] Upstream update to 2.14.7 --- .gitignore | 1 + 7kaa-formatSecurity.patch | 75 --------------------------------------- 7kaa.spec | 12 +++++-- sources | 3 +- 4 files changed, 12 insertions(+), 79 deletions(-) delete mode 100644 7kaa-formatSecurity.patch diff --git a/.gitignore b/.gitignore index 35bebfd..68f1a03 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /7kaa-formatSecurity.patch /7kaa.autodlrc /7kaa-2.14.6.tar.xz +/7kaa-2.14.7.tar.xz diff --git a/7kaa-formatSecurity.patch b/7kaa-formatSecurity.patch deleted file mode 100644 index 7af2331..0000000 --- a/7kaa-formatSecurity.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up ./src/client/ORACERES.cpp.libintl ./src/client/ORACERES.cpp ---- ./src/client/ORACERES.cpp.libintl 2015-05-19 11:00:20.000000000 +1000 -+++ ./src/client/ORACERES.cpp 2015-05-31 23:48:19.960448911 +1000 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include "gettext.h" -+#include - - //---------- #define constant ------------// - -@@ -540,52 +540,52 @@ static void translate_race_adjective(cha - if( strncmp(adjective, "Norman", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Norman Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Norman") ); -+ strncpy( adjective, pgettext("Race Adjective", "Norman"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Mayan", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Mayan Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Mayan") ); -+ strncpy( adjective, pgettext("Race Adjective", "Mayan"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Greek", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Greek Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Greek") ); -+ strncpy( adjective, pgettext("Race Adjective", "Greek"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Viking", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Viking Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Viking") ); -+ strncpy( adjective, pgettext("Race Adjective", "Viking"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Persian", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Persian Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Persian") ); -+ strncpy( adjective, pgettext("Race Adjective", "Persian"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Chinese", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Chinese Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Chinese") ); -+ strncpy( adjective, pgettext("Race Adjective", "Chinese"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Japanese", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Japanese Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Japanese") ); -+ strncpy( adjective, pgettext("Race Adjective", "Japanese"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Egyptian", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Egyptian Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Egyptian") ); -+ strncpy( adjective, pgettext("Race Adjective", "Egyptian"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Mughul", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Mughul Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Mughul") ); -+ strncpy( adjective, pgettext("Race Adjective", "Mughul"), RaceInfo::ADJECTIVE_LEN+1 ); - } - else if( strncmp(adjective, "Zulu", RaceInfo::ADJECTIVE_LEN) == 0 ) - { - // TRANSLATORS: "the Zulu Scroll of Power" -- snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Zulu") ); -+ strncpy( adjective, pgettext("Race Adjective", "Zulu"), RaceInfo::ADJECTIVE_LEN+1 ); - } - } - //---------- End of function translate_race_adjective -----------// diff --git a/7kaa.spec b/7kaa.spec index bb25a97..d323998 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,8 +1,8 @@ %global icon_file 7kaa_icon.png %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa -Version: 2.14.6 -Release: 4%{?dist} +Version: 2.14.7 +Release: 1%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -16,7 +16,10 @@ BuildRequires: openal-soft-devel, autoconf BuildRequires: gettext-devel BuildRequires: desktop-file-utils BuildRequires: ImageMagick +BuildRequires: libcurl-devel + Requires: %{name}-data = %{version}-%{release} +Requires: libcurl %description Seven Kingdoms is a real-time strategy (RTS) computer game developed @@ -153,6 +156,11 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Thu Dec 07 2017 Ding-Yi Chen - 2.14.7-1 +- Upstream update to 2.14.7 + Fixes Bug 1458610 - 7kaa-2.14.7 is available +- Add Requires and BuildRequires libcurl + * Wed Aug 02 2017 Fedora Release Engineering - 2.14.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 8a46102..83c7261 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (7kaa-2.14.6.tar.xz) = 845ce121957959b122a29173b2c52fa6d93a62b25b90f623e683f340d3ab52fc12cc64ef40d866ae44d9de27b5b0028d23c7437ff3b7026edf3879883492e27e -SHA512 (7kaa.autodlrc) = 9ae5ca2bdb77c49114490996eeebbced45283f938d9cc330a381bba1e3a26ffdabd899925a88f11d1f2fc7616afbd3951853b1e3b72399f9bc9b2b20149a8bdd +SHA512 (7kaa-2.14.7.tar.xz) = 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1 From bc566bb77b4da4e78f1de5911b6a9264fedfb9f1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 7 Jan 2018 18:58:13 +0100 Subject: [PATCH 09/28] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- 7kaa.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/7kaa.spec b/7kaa.spec index d323998..0dbc9e6 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -116,22 +116,6 @@ install -m 644 %{SOURCE1} %{buildroot}%{prj_music_dir} rm -f %{buildroot}%{_docdir}/%{name}/COPYING -%post data -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun data -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - if [ -x /usr/bin/gtk-update-icon-cache ];then - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - fi -fi - -%posttrans data -if [ -x /usr/bin/gtk-update-icon-cache ];then - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - %postun music if [ $1 -eq 0 ] ; then ## When Uninstall @@ -156,6 +140,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Sun Jan 07 2018 Igor Gnatenko - 2.14.7-2 +- Remove obsolete scriptlets + * Thu Dec 07 2017 Ding-Yi Chen - 2.14.7-1 - Upstream update to 2.14.7 Fixes Bug 1458610 - 7kaa-2.14.7 is available From 9c11cd72b82f98b6ffa58728dc5395b8fb5a18e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:22:27 +0000 Subject: [PATCH 10/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 0dbc9e6..79253c7 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -140,6 +140,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.14.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 07 2018 Igor Gnatenko - 2.14.7-2 - Remove obsolete scriptlets From 2f5fe84d88de417887b20871a79f8b3ae2095a91 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 16:12:45 +0200 Subject: [PATCH 11/28] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- 7kaa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/7kaa.spec b/7kaa.spec index 79253c7..6fccd3d 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -10,6 +10,7 @@ URL: http://7kfans.com/ Source0: http://sourceforge.net/projects/skfans/files/%{name}-%{version}.tar.xz Source1: %{name}.autodlrc +BuildRequires: gcc-c++ BuildRequires: SDL2-devel, SDL2_net-devel BuildRequires: enet-devel BuildRequires: openal-soft-devel, autoconf From 1f5e0f58501357483b5da4aacadcaf5c372c700e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 18:53:29 +0000 Subject: [PATCH 12/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 6fccd3d..ebefd78 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -141,6 +141,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.14.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.14.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5c364681382c37bbdd2a693e55e98b6594d2b755 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:20:33 +0000 Subject: [PATCH 13/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index ebefd78..bd7ce71 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -141,6 +141,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.14.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 2.14.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 71f4a41369312893c19c9370fe52558ccd010ad9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 15:37:54 +0000 Subject: [PATCH 14/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index bd7ce71..a5474e5 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -2,7 +2,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.14.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Seven Kingdoms: Ancient Adversaries License: GPLv3+ and GPLv2+ @@ -141,6 +141,9 @@ fi %dir %{_docdir}/%{name}-music %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.14.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.14.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dbfc156df8fdfb9326d6926daf4d0d103af049ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 16 Sep 2019 11:16:26 +0200 Subject: [PATCH 15/28] Orphaned for 6+ weeks --- .gitignore | 5 -- 7kaa.autodlrc | 50 ------------ 7kaa.spec | 221 -------------------------------------------------- dead.package | 1 + sources | 1 - 5 files changed, 1 insertion(+), 277 deletions(-) delete mode 100644 .gitignore delete mode 100644 7kaa.autodlrc delete mode 100644 7kaa.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 68f1a03..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/7kaa-2.14.5.tar.xz -/7kaa-formatSecurity.patch -/7kaa.autodlrc -/7kaa-2.14.6.tar.xz -/7kaa-2.14.7.tar.xz diff --git a/7kaa.autodlrc b/7kaa.autodlrc deleted file mode 100644 index 15b6df4..0000000 --- a/7kaa.autodlrc +++ /dev/null @@ -1,50 +0,0 @@ -[MESSAGELIST] -[MESSAGE] - [TITLE]Please click 'Accept' to allow internet and sudo access.[/TITLE] - [TEXT]Seven Kingdoms is a real-time strategy (RTS) computer game developed by Trevor Chan of Enlight Software. - -Seven Kingdoms: Ancient Adversaries is a free patch provided by Interactive Magic and added three new cultures, the Egyptians, the -Mughals and the Zulus, and a new war machine, Unicorn. - - - -Please click Accept to allow 7kaa to download and install the music files and to /usr/share/7kaa/music.[/TEXT] -[/MESSAGE] -[MESSAGE] - [TITLE]License Information[/TITLE] - [TEXT]Seven Kingdoms Music Soundtrack -Copyright (c)1997 Bjorn Lynne -Copyright (c)1997 Enlight Software Ltd. - -Permission is granted to anyone to use these media files with -Seven Kingdoms: Ancient Adversaries from Enlight Ltd., and to redistribute -copies of these media files freely, subject to the following restrictions: - -1. The redistributed media files are a complete set, unmodified, and correctly - represented for use with Seven Kingdoms. - -2. The authors are acknowledged with any distribution. - -3. This notice may not be removed or altered in any distribution. - -The authors do not grant any additional right outside of the use with -Seven Kingdoms. Any re-recording or derivative works based on the provided -soundtracks is subject to any applicable copyright laws. - -These media files are provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from use of these media files. -[/TEXT] -[/MESSAGE] -[/MESSAGELIST] - -[FILELIST] -[FILE] - [FILENAME]7kaa-music.tar.bz2[/FILENAME] - [MD5]90716e41b58e56b816ffea797fb24676[/MD5] - [PATH]/tmp/7kaa-music[/PATH] - [MIRRORS] - [URL]http://www.7kfans.com/downloads/7kaa-music.tar.bz2[/URL] - [/MIRRORS] -[/FILE] -[/FILELIST] diff --git a/7kaa.spec b/7kaa.spec deleted file mode 100644 index a5474e5..0000000 --- a/7kaa.spec +++ /dev/null @@ -1,221 +0,0 @@ -%global icon_file 7kaa_icon.png -%global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps -Name: 7kaa -Version: 2.14.7 -Release: 6%{?dist} -Summary: Seven Kingdoms: Ancient Adversaries - -License: GPLv3+ and GPLv2+ -URL: http://7kfans.com/ -Source0: http://sourceforge.net/projects/skfans/files/%{name}-%{version}.tar.xz -Source1: %{name}.autodlrc - -BuildRequires: gcc-c++ -BuildRequires: SDL2-devel, SDL2_net-devel -BuildRequires: enet-devel -BuildRequires: openal-soft-devel, autoconf -BuildRequires: gettext-devel -BuildRequires: desktop-file-utils -BuildRequires: ImageMagick -BuildRequires: libcurl-devel - -Requires: %{name}-data = %{version}-%{release} -Requires: libcurl - -%description -Seven Kingdoms is a real-time strategy (RTS) computer game developed -by Trevor Chan of Enlight Software. The game enables players to -compete against up to six other kingdoms allowing players to conquer -opponents by defeating them in war (with troops or machines), -capturing their buildings with spies, or offering opponents money -for their kingdom. - -Seven Kingdoms: Ancient Adversaries is a free patch provided by -Interactive Magic and added three new cultures, the Egyptians, the -Mughals and the Zulus, and a new war machine, Unicorn. - -%package data -BuildArch: noarch -Summary: In-Game data Seven Kingdoms: Ancient Adversaries - -Requires: %{name} = %{version}-%{release} -Requires: hicolor-icon-theme - -%description data -In-Game music data Seven Kingdoms: Ancient Adversaries - -%package music -License: Redistributable, no modification permitted -BuildArch: noarch -Summary: In-Game music for Seven Kingdoms: Ancient Adversaries - -Requires: %{name}-data = %{version}-%{release} -Requires: autodownloader, sudo - -%description music -In-Game music for Seven Kingdoms: Ancient Adversaries -Due to license issue, you need to run 7kaa-data-installer install the music. - -%prep -%setup -q - -%build -# https://bugzilla.redhat.com/show_bug.cgi?id=1306226 -export CXXFLAGS="%{optflags} -fsigned-char" -%configure -make %{?_smp_mflags} -convert data/image/7k_icon.bmp %{icon_file} - - -%install -%make_install -mkdir -p %{buildroot}%{icon_dest_dir} -install -m 644 %{icon_file} %{buildroot}%{icon_dest_dir} - -### == desktop file -cat>%{name}.desktop<%{data_installer}< /dev/stderr - exit 2 -fi -if ! /usr/share/autodl/AutoDL.py %{prj_music_dir}/%{name}.autodlrc; then - echo "Error on music download" > /dev/stderr - exit 3 -fi -cd /tmp/%{name}-music -tar xjvf /tmp/%{name}-music/%{name}-music.tar.bz2 -sudo install -v -m 644 /tmp/%{name}-music/%{name}-music/music/* /usr/share/%{name}/music -sudo install -v -m 644 /tmp/%{name}-music/%{name}-music/*.txt /usr/share/doc/%{name}-music -echo "Done" -END - -install -m 755 %{data_installer} %{buildroot}%{_bindir}/%{data_installer} -install -m 644 %{SOURCE1} %{buildroot}%{prj_music_dir} - -rm -f %{buildroot}%{_docdir}/%{name}/COPYING - -%postun music -if [ $1 -eq 0 ] ; then -## When Uninstall - rm -fr %{prj_music_dir} -fi - -%files -%doc README -%license COPYING -%{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop - -%files data -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/[^m]* -%{icon_dest_dir}/%{icon_file} - -%files music -%{_bindir}/%{data_installer} -%dir %{prj_music_dir} -%{prj_music_dir}/%{name}.autodlrc -%dir %{_docdir}/%{name}-music - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 2.14.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.14.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.14.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.14.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 07 2018 Igor Gnatenko - 2.14.7-2 -- Remove obsolete scriptlets - -* Thu Dec 07 2017 Ding-Yi Chen - 2.14.7-1 -- Upstream update to 2.14.7 - Fixes Bug 1458610 - 7kaa-2.14.7 is available -- Add Requires and BuildRequires libcurl - -* Wed Aug 02 2017 Fedora Release Engineering - 2.14.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.14.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Mar 11 2017 Raphael Groner - 2.14.6-2 -- rebuilt due to branching - -* Wed Mar 01 2017 Ding-Yi Chen 2.14.6-1 -- Upstream update to 2.14.6 - -* Fri Feb 10 2017 Fedora Release Engineering - 2.14.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Mar 07 2016 Yaakov Selkowitz - 2.14.5-12 -- Build with -fsigned-char to fix FTBFS with GCC 6 (#1306226) - -* Wed Feb 03 2016 Fedora Release Engineering - 2.14.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 20 2015 Ding-Yi Chen 2.14.5-10 -- music won't get uninstall when upgrading. -- Remove /usr/share/doc/COPYING as it is already installed. - -* Fri Jun 26 2015 Ding-Yi Chen 2.14.5-8 -- Use name macro whenever possible. - -* Wed Jun 24 2015 Ding-Yi Chen 2.14.5-7 -- Fix the .desktop file. - -* Tue Jun 23 2015 Ding-Yi Chen 2.14.5-6 -- Requires: hicolor-icon-theme -- License become GPLv3+ and GPLv2+ as "gettext.h" is GPLv3 - -* Wed Jun 17 2015 Ding-Yi Chen 2.14.5-5 -- Fix for Review Request Comment #11 - -* Tue Jun 16 2015 Ding-Yi Chen 2.14.5-4 -- Fix for Review Request Comment #10 - -* Tue Jun 02 2015 Ding-Yi Chen 2.14.5-3 -- Fix for Review Request Comment #8 - -* Mon Jun 01 2015 Ding-Yi Chen 2.14.5-2 -- Fix for Review Request Comment #6 - -* Sun May 31 2015 Ding-Yi Chen 2.14.5-1 -- Upstream update to 2.14.5 -- BuildRequires: add enet-devel -- Use autodownloader to download music. - -* Wed May 27 2015 Ding-Yi Chen 2.14.4-2 -- Remove music. - -* Tue May 05 2015 Ding-Yi Chen 2.14.4-1 -- Initial packaging. - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 83c7261..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (7kaa-2.14.7.tar.xz) = 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1 From 3d2b3cac91cbbd1d971c3b470ef666ebe129ba7f Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Mon, 13 Jul 2020 12:01:15 +0200 Subject: [PATCH 16/28] Revert "Orphaned for 6+ weeks" This reverts commit dbfc156df8fdfb9326d6926daf4d0d103af049ba. Unretirement request: https://pagure.io/releng/issue/9593 Signed-off-by: Tomas Hrcka --- .gitignore | 5 ++ 7kaa.autodlrc | 50 ++++++++++++ 7kaa.spec | 221 ++++++++++++++++++++++++++++++++++++++++++++++++++ dead.package | 1 - sources | 1 + 5 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 7kaa.autodlrc create mode 100644 7kaa.spec delete mode 100644 dead.package create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..68f1a03 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/7kaa-2.14.5.tar.xz +/7kaa-formatSecurity.patch +/7kaa.autodlrc +/7kaa-2.14.6.tar.xz +/7kaa-2.14.7.tar.xz diff --git a/7kaa.autodlrc b/7kaa.autodlrc new file mode 100644 index 0000000..15b6df4 --- /dev/null +++ b/7kaa.autodlrc @@ -0,0 +1,50 @@ +[MESSAGELIST] +[MESSAGE] + [TITLE]Please click 'Accept' to allow internet and sudo access.[/TITLE] + [TEXT]Seven Kingdoms is a real-time strategy (RTS) computer game developed by Trevor Chan of Enlight Software. + +Seven Kingdoms: Ancient Adversaries is a free patch provided by Interactive Magic and added three new cultures, the Egyptians, the +Mughals and the Zulus, and a new war machine, Unicorn. + + + +Please click Accept to allow 7kaa to download and install the music files and to /usr/share/7kaa/music.[/TEXT] +[/MESSAGE] +[MESSAGE] + [TITLE]License Information[/TITLE] + [TEXT]Seven Kingdoms Music Soundtrack +Copyright (c)1997 Bjorn Lynne +Copyright (c)1997 Enlight Software Ltd. + +Permission is granted to anyone to use these media files with +Seven Kingdoms: Ancient Adversaries from Enlight Ltd., and to redistribute +copies of these media files freely, subject to the following restrictions: + +1. The redistributed media files are a complete set, unmodified, and correctly + represented for use with Seven Kingdoms. + +2. The authors are acknowledged with any distribution. + +3. This notice may not be removed or altered in any distribution. + +The authors do not grant any additional right outside of the use with +Seven Kingdoms. Any re-recording or derivative works based on the provided +soundtracks is subject to any applicable copyright laws. + +These media files are provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from use of these media files. +[/TEXT] +[/MESSAGE] +[/MESSAGELIST] + +[FILELIST] +[FILE] + [FILENAME]7kaa-music.tar.bz2[/FILENAME] + [MD5]90716e41b58e56b816ffea797fb24676[/MD5] + [PATH]/tmp/7kaa-music[/PATH] + [MIRRORS] + [URL]http://www.7kfans.com/downloads/7kaa-music.tar.bz2[/URL] + [/MIRRORS] +[/FILE] +[/FILELIST] diff --git a/7kaa.spec b/7kaa.spec new file mode 100644 index 0000000..a5474e5 --- /dev/null +++ b/7kaa.spec @@ -0,0 +1,221 @@ +%global icon_file 7kaa_icon.png +%global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps +Name: 7kaa +Version: 2.14.7 +Release: 6%{?dist} +Summary: Seven Kingdoms: Ancient Adversaries + +License: GPLv3+ and GPLv2+ +URL: http://7kfans.com/ +Source0: http://sourceforge.net/projects/skfans/files/%{name}-%{version}.tar.xz +Source1: %{name}.autodlrc + +BuildRequires: gcc-c++ +BuildRequires: SDL2-devel, SDL2_net-devel +BuildRequires: enet-devel +BuildRequires: openal-soft-devel, autoconf +BuildRequires: gettext-devel +BuildRequires: desktop-file-utils +BuildRequires: ImageMagick +BuildRequires: libcurl-devel + +Requires: %{name}-data = %{version}-%{release} +Requires: libcurl + +%description +Seven Kingdoms is a real-time strategy (RTS) computer game developed +by Trevor Chan of Enlight Software. The game enables players to +compete against up to six other kingdoms allowing players to conquer +opponents by defeating them in war (with troops or machines), +capturing their buildings with spies, or offering opponents money +for their kingdom. + +Seven Kingdoms: Ancient Adversaries is a free patch provided by +Interactive Magic and added three new cultures, the Egyptians, the +Mughals and the Zulus, and a new war machine, Unicorn. + +%package data +BuildArch: noarch +Summary: In-Game data Seven Kingdoms: Ancient Adversaries + +Requires: %{name} = %{version}-%{release} +Requires: hicolor-icon-theme + +%description data +In-Game music data Seven Kingdoms: Ancient Adversaries + +%package music +License: Redistributable, no modification permitted +BuildArch: noarch +Summary: In-Game music for Seven Kingdoms: Ancient Adversaries + +Requires: %{name}-data = %{version}-%{release} +Requires: autodownloader, sudo + +%description music +In-Game music for Seven Kingdoms: Ancient Adversaries +Due to license issue, you need to run 7kaa-data-installer install the music. + +%prep +%setup -q + +%build +# https://bugzilla.redhat.com/show_bug.cgi?id=1306226 +export CXXFLAGS="%{optflags} -fsigned-char" +%configure +make %{?_smp_mflags} +convert data/image/7k_icon.bmp %{icon_file} + + +%install +%make_install +mkdir -p %{buildroot}%{icon_dest_dir} +install -m 644 %{icon_file} %{buildroot}%{icon_dest_dir} + +### == desktop file +cat>%{name}.desktop<%{data_installer}< /dev/stderr + exit 2 +fi +if ! /usr/share/autodl/AutoDL.py %{prj_music_dir}/%{name}.autodlrc; then + echo "Error on music download" > /dev/stderr + exit 3 +fi +cd /tmp/%{name}-music +tar xjvf /tmp/%{name}-music/%{name}-music.tar.bz2 +sudo install -v -m 644 /tmp/%{name}-music/%{name}-music/music/* /usr/share/%{name}/music +sudo install -v -m 644 /tmp/%{name}-music/%{name}-music/*.txt /usr/share/doc/%{name}-music +echo "Done" +END + +install -m 755 %{data_installer} %{buildroot}%{_bindir}/%{data_installer} +install -m 644 %{SOURCE1} %{buildroot}%{prj_music_dir} + +rm -f %{buildroot}%{_docdir}/%{name}/COPYING + +%postun music +if [ $1 -eq 0 ] ; then +## When Uninstall + rm -fr %{prj_music_dir} +fi + +%files +%doc README +%license COPYING +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop + +%files data +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/[^m]* +%{icon_dest_dir}/%{icon_file} + +%files music +%{_bindir}/%{data_installer} +%dir %{prj_music_dir} +%{prj_music_dir}/%{name}.autodlrc +%dir %{_docdir}/%{name}-music + +%changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.14.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.14.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2.14.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.14.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 07 2018 Igor Gnatenko - 2.14.7-2 +- Remove obsolete scriptlets + +* Thu Dec 07 2017 Ding-Yi Chen - 2.14.7-1 +- Upstream update to 2.14.7 + Fixes Bug 1458610 - 7kaa-2.14.7 is available +- Add Requires and BuildRequires libcurl + +* Wed Aug 02 2017 Fedora Release Engineering - 2.14.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.14.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Mar 11 2017 Raphael Groner - 2.14.6-2 +- rebuilt due to branching + +* Wed Mar 01 2017 Ding-Yi Chen 2.14.6-1 +- Upstream update to 2.14.6 + +* Fri Feb 10 2017 Fedora Release Engineering - 2.14.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Mar 07 2016 Yaakov Selkowitz - 2.14.5-12 +- Build with -fsigned-char to fix FTBFS with GCC 6 (#1306226) + +* Wed Feb 03 2016 Fedora Release Engineering - 2.14.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Oct 20 2015 Ding-Yi Chen 2.14.5-10 +- music won't get uninstall when upgrading. +- Remove /usr/share/doc/COPYING as it is already installed. + +* Fri Jun 26 2015 Ding-Yi Chen 2.14.5-8 +- Use name macro whenever possible. + +* Wed Jun 24 2015 Ding-Yi Chen 2.14.5-7 +- Fix the .desktop file. + +* Tue Jun 23 2015 Ding-Yi Chen 2.14.5-6 +- Requires: hicolor-icon-theme +- License become GPLv3+ and GPLv2+ as "gettext.h" is GPLv3 + +* Wed Jun 17 2015 Ding-Yi Chen 2.14.5-5 +- Fix for Review Request Comment #11 + +* Tue Jun 16 2015 Ding-Yi Chen 2.14.5-4 +- Fix for Review Request Comment #10 + +* Tue Jun 02 2015 Ding-Yi Chen 2.14.5-3 +- Fix for Review Request Comment #8 + +* Mon Jun 01 2015 Ding-Yi Chen 2.14.5-2 +- Fix for Review Request Comment #6 + +* Sun May 31 2015 Ding-Yi Chen 2.14.5-1 +- Upstream update to 2.14.5 +- BuildRequires: add enet-devel +- Use autodownloader to download music. + +* Wed May 27 2015 Ding-Yi Chen 2.14.4-2 +- Remove music. + +* Tue May 05 2015 Ding-Yi Chen 2.14.4-1 +- Initial packaging. + diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..83c7261 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (7kaa-2.14.7.tar.xz) = 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1 From be24d2525c85e4a72d297c7e29061400fc0e9213 Mon Sep 17 00:00:00 2001 From: Andy Mender Date: Mon, 13 Jul 2020 22:25:56 +0200 Subject: [PATCH 17/28] Initial import (#1837107) Signed-off-by: Andy Mender --- .gitignore | 1 + 7kaa.autodlrc | 50 -------------------- 7kaa.spec | 128 ++++++++++++++++++++------------------------------ sources | 2 +- 4 files changed, 52 insertions(+), 129 deletions(-) delete mode 100644 7kaa.autodlrc diff --git a/.gitignore b/.gitignore index 68f1a03..9bad02d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /7kaa.autodlrc /7kaa-2.14.6.tar.xz /7kaa-2.14.7.tar.xz +/7kaa-2.15.4.tar.gz diff --git a/7kaa.autodlrc b/7kaa.autodlrc deleted file mode 100644 index 15b6df4..0000000 --- a/7kaa.autodlrc +++ /dev/null @@ -1,50 +0,0 @@ -[MESSAGELIST] -[MESSAGE] - [TITLE]Please click 'Accept' to allow internet and sudo access.[/TITLE] - [TEXT]Seven Kingdoms is a real-time strategy (RTS) computer game developed by Trevor Chan of Enlight Software. - -Seven Kingdoms: Ancient Adversaries is a free patch provided by Interactive Magic and added three new cultures, the Egyptians, the -Mughals and the Zulus, and a new war machine, Unicorn. - - - -Please click Accept to allow 7kaa to download and install the music files and to /usr/share/7kaa/music.[/TEXT] -[/MESSAGE] -[MESSAGE] - [TITLE]License Information[/TITLE] - [TEXT]Seven Kingdoms Music Soundtrack -Copyright (c)1997 Bjorn Lynne -Copyright (c)1997 Enlight Software Ltd. - -Permission is granted to anyone to use these media files with -Seven Kingdoms: Ancient Adversaries from Enlight Ltd., and to redistribute -copies of these media files freely, subject to the following restrictions: - -1. The redistributed media files are a complete set, unmodified, and correctly - represented for use with Seven Kingdoms. - -2. The authors are acknowledged with any distribution. - -3. This notice may not be removed or altered in any distribution. - -The authors do not grant any additional right outside of the use with -Seven Kingdoms. Any re-recording or derivative works based on the provided -soundtracks is subject to any applicable copyright laws. - -These media files are provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from use of these media files. -[/TEXT] -[/MESSAGE] -[/MESSAGELIST] - -[FILELIST] -[FILE] - [FILENAME]7kaa-music.tar.bz2[/FILENAME] - [MD5]90716e41b58e56b816ffea797fb24676[/MD5] - [PATH]/tmp/7kaa-music[/PATH] - [MIRRORS] - [URL]http://www.7kfans.com/downloads/7kaa-music.tar.bz2[/URL] - [/MIRRORS] -[/FILE] -[/FILELIST] diff --git a/7kaa.spec b/7kaa.spec index a5474e5..fcf5c58 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,26 +1,28 @@ -%global icon_file 7kaa_icon.png %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa -Version: 2.14.7 -Release: 6%{?dist} +Version: 2.15.4 +Release: 1%{?dist} Summary: Seven Kingdoms: Ancient Adversaries -License: GPLv3+ and GPLv2+ +# Main program: GPLv2+ +# misc_uuid: BSD +License: GPLv2+ and BSD URL: http://7kfans.com/ -Source0: http://sourceforge.net/projects/skfans/files/%{name}-%{version}.tar.xz -Source1: %{name}.autodlrc +Source0: https://github.com/the3dfxdude/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++ -BuildRequires: SDL2-devel, SDL2_net-devel -BuildRequires: enet-devel -BuildRequires: openal-soft-devel, autoconf -BuildRequires: gettext-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: desktop-file-utils -BuildRequires: ImageMagick +BuildRequires: enet-devel +BuildRequires: gcc-c++ +BuildRequires: gettext-devel BuildRequires: libcurl-devel +BuildRequires: openal-soft-devel +BuildRequires: SDL2-devel +BuildRequires: SDL2_net-devel Requires: %{name}-data = %{version}-%{release} -Requires: libcurl +Requires: hicolor-icon-theme %description Seven Kingdoms is a real-time strategy (RTS) computer game developed @@ -34,6 +36,8 @@ Seven Kingdoms: Ancient Adversaries is a free patch provided by Interactive Magic and added three new cultures, the Egyptians, the Mughals and the Zulus, and a new war machine, Unicorn. +Due to licensing, in-game music needs to be downloaded separately. + %package data BuildArch: noarch Summary: In-Game data Seven Kingdoms: Ancient Adversaries @@ -42,19 +46,7 @@ Requires: %{name} = %{version}-%{release} Requires: hicolor-icon-theme %description data -In-Game music data Seven Kingdoms: Ancient Adversaries - -%package music -License: Redistributable, no modification permitted -BuildArch: noarch -Summary: In-Game music for Seven Kingdoms: Ancient Adversaries - -Requires: %{name}-data = %{version}-%{release} -Requires: autodownloader, sudo - -%description music -In-Game music for Seven Kingdoms: Ancient Adversaries -Due to license issue, you need to run 7kaa-data-installer install the music. +In-Game data Seven Kingdoms: Ancient Adversaries. %prep %setup -q @@ -62,85 +54,65 @@ Due to license issue, you need to run 7kaa-data-installer install the music. %build # https://bugzilla.redhat.com/show_bug.cgi?id=1306226 export CXXFLAGS="%{optflags} -fsigned-char" +./autogen.sh %configure -make %{?_smp_mflags} -convert data/image/7k_icon.bmp %{icon_file} - +%make_build %install -%make_install +%make_install -p +%find_lang %{name} + +### == icon files mkdir -p %{buildroot}%{icon_dest_dir} -install -m 644 %{icon_file} %{buildroot}%{icon_dest_dir} +install -m 644 doc/7kicon.png %{buildroot}%{icon_dest_dir} ### == desktop file -cat>%{name}.desktop< %{name}.desktop << EOF [Desktop Entry] Name=%{name} GenericName=Seven Kingdoms: Ancient Adversaries Comment=A real-time strategy (RTS) computer game -Exec=/usr/bin/%{name} +Exec=%{_bindir}/%{name} Icon=%{name}_icon Terminal=false Type=Application Categories=Game;StrategyGame -END +EOF desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop -### == music autodownload -%global data_installer %{name}-data-installer -%global prj_music_dir %{_datadir}/%{name}/music -mkdir -p %{buildroot}%{prj_music_dir} -mkdir -p %{buildroot}/usr/share/doc/%{name}-music - -### === Downloader -cat >%{data_installer}< /dev/stderr - exit 2 -fi -if ! /usr/share/autodl/AutoDL.py %{prj_music_dir}/%{name}.autodlrc; then - echo "Error on music download" > /dev/stderr - exit 3 -fi -cd /tmp/%{name}-music -tar xjvf /tmp/%{name}-music/%{name}-music.tar.bz2 -sudo install -v -m 644 /tmp/%{name}-music/%{name}-music/music/* /usr/share/%{name}/music -sudo install -v -m 644 /tmp/%{name}-music/%{name}-music/*.txt /usr/share/doc/%{name}-music -echo "Done" -END - -install -m 755 %{data_installer} %{buildroot}%{_bindir}/%{data_installer} -install -m 644 %{SOURCE1} %{buildroot}%{prj_music_dir} - +### == remove misplaced license file rm -f %{buildroot}%{_docdir}/%{name}/COPYING -%postun music -if [ $1 -eq 0 ] ; then -## When Uninstall - rm -fr %{prj_music_dir} -fi - -%files +%files -f %{name}.lang %doc README %license COPYING %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop +%{icon_dest_dir}/7kicon.png %files data -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/[^m]* -%{icon_dest_dir}/%{icon_file} - -%files music -%{_bindir}/%{data_installer} -%dir %{prj_music_dir} -%{prj_music_dir}/%{name}.autodlrc -%dir %{_docdir}/%{name}-music +%{_datadir}/%{name}/ %changelog +* Sun Jul 05 2020 Andy Mender - 2.15.4-1 +- Bump version and improve spec file + +* Wed Jun 17 2020 Andy Mender - 2.15.3-5 +- Use the make_build macro instead of legacy _smp_mflags + +* Wed May 27 2020 Andy Mender - 2.15.3-4 +- Fix files section, correct description + +* Tue May 26 2020 Andy Mender - 2.15.3-3 +- Split off music installation from main 7kaa package + +* Sat May 23 2020 Andy Mender - 2.15.3-2 +- Clean up and improve spec file + +* Sun May 17 2020 Andy Mender - 2.15.3-1 +- Try to unorphan and update the package + * Wed Jul 24 2019 Fedora Release Engineering - 2.14.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 83c7261..a5b35aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (7kaa-2.14.7.tar.xz) = 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1 +SHA512 (7kaa-2.15.4.tar.gz) = 5aadc458517e3fc5bce577ef5aff5fb5508c52b77884ea7d2149fcd3fed5f86cf10e687d4f738a1507f395c80099f9d56f2c0c209e80e5133142ec16e23edf14 From c2556d17cc9e32b480edd6ae0e3b4ce8f382ff5a Mon Sep 17 00:00:00 2001 From: Andy Mender Date: Sat, 18 Jul 2020 22:01:34 +0200 Subject: [PATCH 18/28] Bump version to 2.15.4p1 --- .gitignore | 1 + 7kaa.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9bad02d..e37b4b4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /7kaa-2.14.6.tar.xz /7kaa-2.14.7.tar.xz /7kaa-2.15.4.tar.gz +/7kaa-2.15.4p1.tar.gz diff --git a/7kaa.spec b/7kaa.spec index fcf5c58..a30de62 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,6 +1,6 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa -Version: 2.15.4 +Version: 2.15.4p1 Release: 1%{?dist} Summary: Seven Kingdoms: Ancient Adversaries @@ -37,6 +37,7 @@ Interactive Magic and added three new cultures, the Egyptians, the Mughals and the Zulus, and a new war machine, Unicorn. Due to licensing, in-game music needs to be downloaded separately. +Place the music files in /usr/share/7kaa/music. %package data BuildArch: noarch @@ -95,6 +96,9 @@ rm -f %{buildroot}%{_docdir}/%{name}/COPYING %{_datadir}/%{name}/ %changelog +* Tue Jul 14 2020 Andy Mender - 2.15.4p1-1 +- Bump version and add note about music files to description + * Sun Jul 05 2020 Andy Mender - 2.15.4-1 - Bump version and improve spec file diff --git a/sources b/sources index a5b35aa..44f97e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (7kaa-2.15.4.tar.gz) = 5aadc458517e3fc5bce577ef5aff5fb5508c52b77884ea7d2149fcd3fed5f86cf10e687d4f738a1507f395c80099f9d56f2c0c209e80e5133142ec16e23edf14 +SHA512 (7kaa-2.15.4p1.tar.gz) = 3b1cc1ae6a49012ce60a082a1b0ee5c21fcd12a0d89e4611f2102801897a86ebf27ec5fa52c0a627ae65198f3c17d251610ff4a79fdf7882671e022918c08068 From b9ee0dd2fa3144739bc3cd852fba6b0c0eeb8c27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 10:11:14 +0000 Subject: [PATCH 19/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index a30de62..b80d103 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,7 +1,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.15.4p1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Seven Kingdoms: Ancient Adversaries # Main program: GPLv2+ @@ -96,6 +96,9 @@ rm -f %{buildroot}%{_docdir}/%{name}/COPYING %{_datadir}/%{name}/ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.15.4p1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Andy Mender - 2.15.4p1-1 - Bump version and add note about music files to description From 6b58d0cd62173f6b21699370c579b1401220c3df Mon Sep 17 00:00:00 2001 From: Andy Mender Date: Sun, 13 Sep 2020 12:13:42 +0200 Subject: [PATCH 20/28] Use pkgconfig for libcurl, enet, SDL2, SDL2_net, openal-soft Signed-off-by: Andy Mender --- 7kaa.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/7kaa.spec b/7kaa.spec index b80d103..3e78d8c 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,7 +1,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.15.4p1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Seven Kingdoms: Ancient Adversaries # Main program: GPLv2+ @@ -13,13 +13,13 @@ Source0: https://github.com/the3dfxdude/%{name}/archive/v%{version}/%{name}-%{v BuildRequires: autoconf BuildRequires: automake BuildRequires: desktop-file-utils -BuildRequires: enet-devel BuildRequires: gcc-c++ BuildRequires: gettext-devel -BuildRequires: libcurl-devel -BuildRequires: openal-soft-devel -BuildRequires: SDL2-devel -BuildRequires: SDL2_net-devel +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libenet) +BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(SDL2_net) Requires: %{name}-data = %{version}-%{release} Requires: hicolor-icon-theme @@ -96,6 +96,9 @@ rm -f %{buildroot}%{_docdir}/%{name}/COPYING %{_datadir}/%{name}/ %changelog +* Sun Sep 13 2020 Andy Mender - 2.15.4p1-3 +- Use pkgconfig for libcurl, enet, SDL2, SDL2_net, openal-soft + * Mon Jul 27 2020 Fedora Release Engineering - 2.15.4p1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1b37431c7de9714369a64797b3f1ea044ffdd555 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:35:26 +0000 Subject: [PATCH 21/28] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- 7kaa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/7kaa.spec b/7kaa.spec index 3e78d8c..0ced772 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -20,6 +20,7 @@ BuildRequires: pkgconfig(libenet) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(SDL2_net) +BuildRequires: make Requires: %{name}-data = %{version}-%{release} Requires: hicolor-icon-theme From f7b22cb04649940a7494a1543431d62544cacdfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 22:14:09 +0000 Subject: [PATCH 22/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 0ced772..c7ace57 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,7 +1,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.15.4p1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Seven Kingdoms: Ancient Adversaries # Main program: GPLv2+ @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_docdir}/%{name}/COPYING %{_datadir}/%{name}/ %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.15.4p1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Sep 13 2020 Andy Mender - 2.15.4p1-3 - Use pkgconfig for libcurl, enet, SDL2, SDL2_net, openal-soft From 8cae49f696af750d107f13dec415b33c7c35173b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 10:42:35 +0000 Subject: [PATCH 23/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 1af329349b34c8fe0d03694ce6fd6b17c1cfd248 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:37:01 +0000 Subject: [PATCH 24/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index c7ace57..02ade65 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,7 +1,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.15.4p1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Seven Kingdoms: Ancient Adversaries # Main program: GPLv2+ @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_docdir}/%{name}/COPYING %{_datadir}/%{name}/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.15.4p1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 2.15.4p1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a126c184d0a06090ef9ff10e3ddefde1b3385ea1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 19:11:26 +0000 Subject: [PATCH 25/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 02ade65..1a757b7 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,7 +1,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.15.4p1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Seven Kingdoms: Ancient Adversaries # Main program: GPLv2+ @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_docdir}/%{name}/COPYING %{_datadir}/%{name}/ %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.15.4p1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.15.4p1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0be90863d2b02fa06b2735e2bfccc3f6ed8095cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 18:24:22 +0000 Subject: [PATCH 26/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 1a757b7..213acb0 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,7 +1,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.15.4p1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Seven Kingdoms: Ancient Adversaries # Main program: GPLv2+ @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_docdir}/%{name}/COPYING %{_datadir}/%{name}/ %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.15.4p1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.15.4p1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ee1d4a6399669cbb0a6d7b7d35d6f3823c7ebb51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 19:35:48 +0000 Subject: [PATCH 27/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 7kaa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 213acb0..79b871c 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,7 +1,7 @@ %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps Name: 7kaa Version: 2.15.4p1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Seven Kingdoms: Ancient Adversaries # Main program: GPLv2+ @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_docdir}/%{name}/COPYING %{_datadir}/%{name}/ %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.15.4p1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 2.15.4p1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0688a6b4590268a91867e994029586d2ab820f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 19 Apr 2023 21:22:49 +0200 Subject: [PATCH 28/28] Orphaned for 6+ weeks --- .gitignore | 7 -- 7kaa.spec | 219 --------------------------------------------------- dead.package | 1 + sources | 1 - 4 files changed, 1 insertion(+), 227 deletions(-) delete mode 100644 .gitignore delete mode 100644 7kaa.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e37b4b4..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/7kaa-2.14.5.tar.xz -/7kaa-formatSecurity.patch -/7kaa.autodlrc -/7kaa-2.14.6.tar.xz -/7kaa-2.14.7.tar.xz -/7kaa-2.15.4.tar.gz -/7kaa-2.15.4p1.tar.gz diff --git a/7kaa.spec b/7kaa.spec deleted file mode 100644 index 79b871c..0000000 --- a/7kaa.spec +++ /dev/null @@ -1,219 +0,0 @@ -%global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps -Name: 7kaa -Version: 2.15.4p1 -Release: 8%{?dist} -Summary: Seven Kingdoms: Ancient Adversaries - -# Main program: GPLv2+ -# misc_uuid: BSD -License: GPLv2+ and BSD -URL: http://7kfans.com/ -Source0: https://github.com/the3dfxdude/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: desktop-file-utils -BuildRequires: gcc-c++ -BuildRequires: gettext-devel -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libenet) -BuildRequires: pkgconfig(openal) -BuildRequires: pkgconfig(sdl2) -BuildRequires: pkgconfig(SDL2_net) -BuildRequires: make - -Requires: %{name}-data = %{version}-%{release} -Requires: hicolor-icon-theme - -%description -Seven Kingdoms is a real-time strategy (RTS) computer game developed -by Trevor Chan of Enlight Software. The game enables players to -compete against up to six other kingdoms allowing players to conquer -opponents by defeating them in war (with troops or machines), -capturing their buildings with spies, or offering opponents money -for their kingdom. - -Seven Kingdoms: Ancient Adversaries is a free patch provided by -Interactive Magic and added three new cultures, the Egyptians, the -Mughals and the Zulus, and a new war machine, Unicorn. - -Due to licensing, in-game music needs to be downloaded separately. -Place the music files in /usr/share/7kaa/music. - -%package data -BuildArch: noarch -Summary: In-Game data Seven Kingdoms: Ancient Adversaries - -Requires: %{name} = %{version}-%{release} -Requires: hicolor-icon-theme - -%description data -In-Game data Seven Kingdoms: Ancient Adversaries. - -%prep -%setup -q - -%build -# https://bugzilla.redhat.com/show_bug.cgi?id=1306226 -export CXXFLAGS="%{optflags} -fsigned-char" -./autogen.sh -%configure -%make_build - -%install -%make_install -p -%find_lang %{name} - -### == icon files -mkdir -p %{buildroot}%{icon_dest_dir} -install -m 644 doc/7kicon.png %{buildroot}%{icon_dest_dir} - -### == desktop file -cat > %{name}.desktop << EOF -[Desktop Entry] -Name=%{name} -GenericName=Seven Kingdoms: Ancient Adversaries -Comment=A real-time strategy (RTS) computer game -Exec=%{_bindir}/%{name} -Icon=%{name}_icon -Terminal=false -Type=Application -Categories=Game;StrategyGame -EOF - -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop - -### == remove misplaced license file -rm -f %{buildroot}%{_docdir}/%{name}/COPYING - -%files -f %{name}.lang -%doc README -%license COPYING -%{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{icon_dest_dir}/7kicon.png - -%files data -%{_datadir}/%{name}/ - -%changelog -* Wed Jan 18 2023 Fedora Release Engineering - 2.15.4p1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 2.15.4p1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 2.15.4p1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.15.4p1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 2.15.4p1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Sep 13 2020 Andy Mender - 2.15.4p1-3 -- Use pkgconfig for libcurl, enet, SDL2, SDL2_net, openal-soft - -* Mon Jul 27 2020 Fedora Release Engineering - 2.15.4p1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Andy Mender - 2.15.4p1-1 -- Bump version and add note about music files to description - -* Sun Jul 05 2020 Andy Mender - 2.15.4-1 -- Bump version and improve spec file - -* Wed Jun 17 2020 Andy Mender - 2.15.3-5 -- Use the make_build macro instead of legacy _smp_mflags - -* Wed May 27 2020 Andy Mender - 2.15.3-4 -- Fix files section, correct description - -* Tue May 26 2020 Andy Mender - 2.15.3-3 -- Split off music installation from main 7kaa package - -* Sat May 23 2020 Andy Mender - 2.15.3-2 -- Clean up and improve spec file - -* Sun May 17 2020 Andy Mender - 2.15.3-1 -- Try to unorphan and update the package - -* Wed Jul 24 2019 Fedora Release Engineering - 2.14.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.14.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.14.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.14.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 07 2018 Igor Gnatenko - 2.14.7-2 -- Remove obsolete scriptlets - -* Thu Dec 07 2017 Ding-Yi Chen - 2.14.7-1 -- Upstream update to 2.14.7 - Fixes Bug 1458610 - 7kaa-2.14.7 is available -- Add Requires and BuildRequires libcurl - -* Wed Aug 02 2017 Fedora Release Engineering - 2.14.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.14.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Mar 11 2017 Raphael Groner - 2.14.6-2 -- rebuilt due to branching - -* Wed Mar 01 2017 Ding-Yi Chen 2.14.6-1 -- Upstream update to 2.14.6 - -* Fri Feb 10 2017 Fedora Release Engineering - 2.14.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Mar 07 2016 Yaakov Selkowitz - 2.14.5-12 -- Build with -fsigned-char to fix FTBFS with GCC 6 (#1306226) - -* Wed Feb 03 2016 Fedora Release Engineering - 2.14.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 20 2015 Ding-Yi Chen 2.14.5-10 -- music won't get uninstall when upgrading. -- Remove /usr/share/doc/COPYING as it is already installed. - -* Fri Jun 26 2015 Ding-Yi Chen 2.14.5-8 -- Use name macro whenever possible. - -* Wed Jun 24 2015 Ding-Yi Chen 2.14.5-7 -- Fix the .desktop file. - -* Tue Jun 23 2015 Ding-Yi Chen 2.14.5-6 -- Requires: hicolor-icon-theme -- License become GPLv3+ and GPLv2+ as "gettext.h" is GPLv3 - -* Wed Jun 17 2015 Ding-Yi Chen 2.14.5-5 -- Fix for Review Request Comment #11 - -* Tue Jun 16 2015 Ding-Yi Chen 2.14.5-4 -- Fix for Review Request Comment #10 - -* Tue Jun 02 2015 Ding-Yi Chen 2.14.5-3 -- Fix for Review Request Comment #8 - -* Mon Jun 01 2015 Ding-Yi Chen 2.14.5-2 -- Fix for Review Request Comment #6 - -* Sun May 31 2015 Ding-Yi Chen 2.14.5-1 -- Upstream update to 2.14.5 -- BuildRequires: add enet-devel -- Use autodownloader to download music. - -* Wed May 27 2015 Ding-Yi Chen 2.14.4-2 -- Remove music. - -* Tue May 05 2015 Ding-Yi Chen 2.14.4-1 -- Initial packaging. - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 44f97e4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (7kaa-2.15.4p1.tar.gz) = 3b1cc1ae6a49012ce60a082a1b0ee5c21fcd12a0d89e4611f2102801897a86ebf27ec5fa52c0a627ae65198f3c17d251610ff4a79fdf7882671e022918c08068