From be24d2525c85e4a72d297c7e29061400fc0e9213 Mon Sep 17 00:00:00 2001 From: Andy Mender Date: Jul 13 2020 20:25:56 +0000 Subject: Initial import (#1837107) Signed-off-by: Andy Mender --- 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: autoconf +BuildRequires: automake +BuildRequires: desktop-file-utils BuildRequires: enet-devel -BuildRequires: openal-soft-devel, autoconf +BuildRequires: gcc-c++ BuildRequires: gettext-devel -BuildRequires: desktop-file-utils -BuildRequires: ImageMagick 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