From 1fa215bacf0a0c4287f0222dbd1c45eeef27537d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 02:35:01 -0600 Subject: [PATCH 01/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 7a66c11..a012a1d 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -162,6 +162,9 @@ fi %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Jul 26 2009 Fedora Release Engineering - 1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 30522dcd727b580600e7af6a7f76270084e554ca Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 20:54:38 -0600 Subject: [PATCH 02/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index a012a1d..6033e5d 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -162,6 +162,9 @@ fi %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Feb 09 2011 Fedora Release Engineering - 1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 38c2ccbbf62a48622a41fa2a5b79f07ecc5b799d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 11:53:23 -0500 Subject: [PATCH 03/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 6033e5d..a3e5bfa 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -162,6 +162,9 @@ fi %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 3f7d997bacc8fdf595348cb3fa288ababc998aef Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 15:49:38 -0600 Subject: [PATCH 04/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index a3e5bfa..ecaf31a 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -162,6 +162,9 @@ fi %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 1.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From e5a408f944377ec6c9824fc408b4ceaba8a9a30f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 25 Feb 2013 17:48:30 -0800 Subject: [PATCH 05/40] Remove --vendor from desktop files for F19+ https://fedorahosted.org/fesco/ticket/1077 --- rott.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/rott.spec b/rott.spec index ecaf31a..4306a34 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -101,11 +101,17 @@ install -p -m 644 %{name}-registered.6 $RPM_BUILD_ROOT%{_mandir}/man6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ +desktop-file-install \ +%if 0 %{?fedora} && 0%{?fedora} < 19 + --vendor fedora \ +%endif --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE4} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ +desktop-file-install \ +%if 0 %{?fedora} && 0%{?fedora} < 19 + --vendor fedora \ +%endif --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE5} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps @@ -148,7 +154,11 @@ fi %{_bindir}/rott-shareware* %{_mandir}/man6/%{name}-shareware.6* %{_datadir}/%{name} +%if 0%{?fedora} && 0%{?fedora} < 19 %{_datadir}/applications/fedora-%{name}-shareware.desktop +%else +%{_datadir}/applications/%{name}-shareware.desktop +%endif %{_datadir}/icons/hicolor/64x64/apps/%{name}.png @@ -157,11 +167,18 @@ fi %doc README COPYING doc/*.txt %{_bindir}/rott-registered* %{_mandir}/man6/%{name}-registered.6* +%if 0%{?fedora} && 0%{?fedora} < 19 %{_datadir}/applications/fedora-%{name}-registered.desktop +%else +%{_datadir}/applications/%{name}-registered.desktop +%endif %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %changelog +* Mon Feb 25 2013 Toshio Kuratomi - 1.1-8 +- Remove --vendor from desktop files for F19+ https://fedorahosted.org/fesco/ticket/1077 + * Thu Feb 14 2013 Fedora Release Engineering - 1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From b76e2dc53f6d880990e12aeb7a710c3546cd23e9 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 25 Feb 2013 17:49:06 -0800 Subject: [PATCH 06/40] Correct typo --- rott.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rott.spec b/rott.spec index 4306a34..e8415f1 100644 --- a/rott.spec +++ b/rott.spec @@ -102,14 +102,14 @@ install -p -m 644 %{name}-registered.6 $RPM_BUILD_ROOT%{_mandir}/man6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ -%if 0 %{?fedora} && 0%{?fedora} < 19 +%if 0%{?fedora} && 0%{?fedora} < 19 --vendor fedora \ %endif --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE4} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ -%if 0 %{?fedora} && 0%{?fedora} < 19 +%if 0%{?fedora} && 0%{?fedora} < 19 --vendor fedora \ %endif --dir $RPM_BUILD_ROOT%{_datadir}/applications \ From 72c283d6f3a8f1db0f1022b4281ee24a9102d54b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 07:53:52 -0500 Subject: [PATCH 07/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index e8415f1..46294b7 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -176,6 +176,9 @@ fi %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Feb 25 2013 Toshio Kuratomi - 1.1-8 - Remove --vendor from desktop files for F19+ https://fedorahosted.org/fesco/ticket/1077 From 6f87e0310ede3cc4a26877bd5a3564aed9451051 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:49:31 -0500 Subject: [PATCH 08/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 46294b7..974f10e 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -176,6 +176,9 @@ fi %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From fd8d684a55fa347d10911eeed84e027eb2546a5d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 15 Jun 2014 14:17:43 +0200 Subject: [PATCH 09/40] New upstream release 1.1.2 - Fix FTBFS (rhbz#1037308) --- .gitignore | 1 + rott-1.1-fix-end-level-display.patch | 21 ------- rott-1.1-gameover.patch | 85 ---------------------------- rott.spec | 38 +++++-------- sources | 2 +- 5 files changed, 16 insertions(+), 131 deletions(-) delete mode 100644 rott-1.1-fix-end-level-display.patch delete mode 100644 rott-1.1-gameover.patch diff --git a/.gitignore b/.gitignore index 245929b..a0b508c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ rott-1.1.tar.gz +/rott-1.1.2.tar.gz diff --git a/rott-1.1-fix-end-level-display.patch b/rott-1.1-fix-end-level-display.patch deleted file mode 100644 index 4485bf6..0000000 --- a/rott-1.1-fix-end-level-display.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up rott-1.1/rott/rt_game.c~ rott-1.1/rott/rt_game.c ---- rott-1.1/rott/rt_game.c~ 2008-08-04 23:36:53.000000000 +0200 -+++ rott-1.1/rott/rt_game.c 2008-08-04 23:36:53.000000000 +0200 -@@ -3426,7 +3426,7 @@ void LevelCompleted - tmpPic = ( pic_t * )W_CacheLumpName( "mmbk", PU_CACHE, Cvt_pic_t, 1 ); - VWB_DrawPic( 0, 0, tmpPic ); - VW_UpdateScreen(); -- DisableScreenStretch(); -+// DisableScreenStretch(); - - IN_StartAck(); - EndBonusVoice = 0; -@@ -3759,7 +3759,7 @@ EndBonusSkip = true; - - - //bna section -- EnableScreenStretch();//bna++ -+// EnableScreenStretch();//bna++ - VW_UpdateScreen();//bna++ - // DisableScreenStretch();//bna++ - //bna section end diff --git a/rott-1.1-gameover.patch b/rott-1.1-gameover.patch deleted file mode 100644 index 9ac3a9a..0000000 --- a/rott-1.1-gameover.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- rott-1.1/rott/rt_vid.c 2008-05-24 08:29:59.000000000 +0200 -+++ rott-1.1.new/rott/rt_vid.c 2008-08-04 23:02:04.000000000 +0200 -@@ -1099,38 +1100,23 @@ - - void VL_DecompressLBM (lbm_t *lbminfo, boolean flip) - { -- byte *screen = (byte *)bufferofs; -- byte *orig; -- int count; -- byte b, -- rept; -+ int count; -+ byte b, rept; - byte *source = (byte *)&lbminfo->data; - byte *buf; - int ht = lbminfo->height; -- -- int x = 0; -- int y; -- byte *origbuf; - byte pal[768]; -- -- -- orig = screen; -- -- if (iGLOBAL_SCREENWIDTH <= 320){ -- buf = (byte *) SafeMalloc (64000); -- }else{ -- buf = (byte *) SafeMalloc (iGLOBAL_SCREENWIDTH*iGLOBAL_SCREENHEIGHT); -- } -- origbuf = buf; -- -- VL_ClearBuffer (displayofs, 0); -- -+ -+ EnableScreenStretch(); -+ - memcpy(&pal[0],lbminfo->palette,768); - - VL_NormalizePalette (&pal[0]); - - VW_MarkUpdateBlock (0, 0, 320, 200); - -+ buf = (byte *)bufferofs; -+ - while (ht--) - { - count = 0; -@@ -1163,36 +1149,7 @@ - buf += (iGLOBAL_SCREENWIDTH-320); //eg 800 - 320) - } - } -- //SetTextMode ( ); //12345678 -- -- { -- int cnt; -- -- cnt = 0; -- screen = orig; -- buf = origbuf; -- VGAMAPMASK (writemask); -- -- //bna section start -- if (iGLOBAL_SCREENWIDTH <= 320){ -- for (y = 0; y < (lbminfo->height*lbminfo->width); y++) -- -- { -- *screen++ = *(buf+y); -- } -- }else{ -- for (y = 0; y < (lbminfo->height); y++){ -- for (x = 0; x < iGLOBAL_SCREENWIDTH; x++){ -- *screen++ = *(buf++); -- } -- } -- } -- // bna section end -- -- } - -- SafeFree(origbuf); -- EnableScreenStretch();//bna++ shut on streech mode - if (flip==true) - VW_UpdateScreen (); - diff --git a/rott.spec b/rott.spec index 974f10e..bef4bc0 100644 --- a/rott.spec +++ b/rott.spec @@ -1,11 +1,11 @@ Name: rott -Version: 1.1 -Release: 10%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ URL: http://icculus.org/rott/ -Source0: http://icculus.org/rott/releases/rott-1.1.tar.gz +Source0: http://icculus.org/rott/releases/rott-%{version}.tar.gz Source1: rott-shareware.sh Source2: rott-registered.sh Source3: rott.autodlrc @@ -15,11 +15,6 @@ Source5: rott-registered.desktop # free datafiles. I believe this constitues fair-use. If anyone disagrees let # me know and I'll remove it Source6: rott.png -Patch0: rott-1.1-gameover.patch -Patch1: rott-1.1-fix-end-level-display.patch -# Note: this gets applied during build, not during prep! -Patch99: rott-1.0-registered.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel desktop-file-utils %description @@ -63,8 +58,6 @@ from this dir. %prep %setup -q -%patch0 -p1 -%patch1 -p1 cp -a doc/rott.6 rott-shareware.6 cp -a doc/rott.6 rott-registered.6 @@ -76,18 +69,17 @@ touch -r rott-registered.6.orig rott-registered.6 %build pushd rott -make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign" -mv rott rott-shareware.bin - -patch -p2 < %{PATCH99} -make clean -make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign" -mv rott rott-registered.bin +make %{?_smp_mflags} \ + EXTRACFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign" \ + ROTT=rott-shareware.bin +make tidy +make %{?_smp_mflags} \ + EXTRACFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign" \ + ROTT=rott-registered.bin SHAREWARE=0 SUPERROTT=1 popd %install -rm -rf $RPM_BUILD_ROOT #no make install target, DIY mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} @@ -119,10 +111,6 @@ install -p -m 644 %{SOURCE6} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/ -%clean -rm -rf $RPM_BUILD_ROOT - - %post shareware touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -149,7 +137,6 @@ fi %files shareware -%defattr(-,root,root,-) %doc README COPYING doc/*.txt %{_bindir}/rott-shareware* %{_mandir}/man6/%{name}-shareware.6* @@ -163,7 +150,6 @@ fi %files registered -%defattr(-,root,root,-) %doc README COPYING doc/*.txt %{_bindir}/rott-registered* %{_mandir}/man6/%{name}-registered.6* @@ -176,6 +162,10 @@ fi %changelog +* Sun Jun 15 2014 Hans de Goede - 1.1.2-1 +- New upstream release 1.1.2 +- Fix FTBFS (rhbz#1037308) + * Sun Jun 08 2014 Fedora Release Engineering - 1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index a10efa0..c3d62a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e4940c364ecfae86375b7b1a77860d9 rott-1.1.tar.gz +d523c7c6c97f95ba84b8cf4deae7db38 rott-1.1.2.tar.gz From 3c8532bb516349facf902530309a29c636b52ecf Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 15 Jun 2014 14:18:59 +0200 Subject: [PATCH 10/40] Drop no longer used patches --- rott-1.0-registered.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 rott-1.0-registered.patch diff --git a/rott-1.0-registered.patch b/rott-1.0-registered.patch deleted file mode 100644 index e14062c..0000000 --- a/rott-1.0-registered.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rott-1.0/rott/develop.h~ 2007-05-11 10:24:32.000000000 +0200 -+++ rott-1.0/rott/develop.h 2007-05-11 10:24:32.000000000 +0200 -@@ -41,8 +41,8 @@ - - #define BNACRASHPREVENT 1 //bna added - // Make sure only one of the following are on at one time --#define SHAREWARE 1 --#define SUPERROTT 0 -+#define SHAREWARE 0 -+#define SUPERROTT 1 - #define SITELICENSE 0 - - // cute little dopefish thing, only works with special patch? From 0ddd4afc57f73ea76cd6dfda9ebccb6947060228 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 00:13:38 +0000 Subject: [PATCH 11/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index bef4bc0..76ac4c2 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -162,6 +162,9 @@ fi %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 15 2014 Hans de Goede - 1.1.2-1 - New upstream release 1.1.2 - Fix FTBFS (rhbz#1037308) From 63f784b8b77bd0e43ead968aba0437168c3eaa97 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 22:30:21 +0000 Subject: [PATCH 12/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 76ac4c2..3e02994 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -162,6 +162,9 @@ fi %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From eb3556ff812bbc80da388bbcb97f43ceb6e6e10e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 16 Jan 2016 11:33:30 +0100 Subject: [PATCH 13/40] Add support for game-data-packager provided assets (rhbz#1295511) - Add appdata files - Modernize spec a bit --- rott-registered.desktop | 4 +- rott-registered.metainfo.xml | 13 ++++++ rott-registered.sh | 5 +++ rott-shareware.appdata.xml | 32 ++++++++++++++ rott-shareware.desktop | 4 +- rott-shareware.sh | 6 +++ rott.spec | 82 +++++++++++++++++------------------- 7 files changed, 99 insertions(+), 47 deletions(-) create mode 100644 rott-registered.metainfo.xml create mode 100644 rott-shareware.appdata.xml diff --git a/rott-registered.desktop b/rott-registered.desktop index 0212bae..e90880e 100644 --- a/rott-registered.desktop +++ b/rott-registered.desktop @@ -1,10 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=Rise of the Triad (Registered) Comment=RotT Registered launch script, this requires the registered data files Exec=rott-registered StartupNotify=false Terminal=false Type=Application -Icon=rott.png +Icon=rott Categories=Game;ActionGame; +Keywords=game;fps;first;person;shooter;rise;triad;rott; diff --git a/rott-registered.metainfo.xml b/rott-registered.metainfo.xml new file mode 100644 index 0000000..b479aac --- /dev/null +++ b/rott-registered.metainfo.xml @@ -0,0 +1,13 @@ + + + rott-registered.desktop + rott-shareware.desktop + CC0-1.0 + GPL-2.0+ + Engine for Rise of the Triad registered + + Place the registered Rise of the Triad datafiles under /usr/share/rott/ + + http://icculus.org/rott/ + jwrdegoede_at_gmail.com + diff --git a/rott-registered.sh b/rott-registered.sh index bfd4714..da31e8f 100644 --- a/rott-registered.sh +++ b/rott-registered.sh @@ -2,6 +2,11 @@ set -e +if [ -f /usr/share/rott/DARKWAR.WAD ]; then + cd /usr/share/rott + exec rott-registered.bin "$@" +fi + if [ ! -f ~/.rott/registered/*.WAD -a ! -f ~/.rott/registered/*.wad ]; then zenity --info --text='In order to play the registered version of Rise of the Triad (ROTT), An Apogee Game, the original registered ROTT datafiles are needed. diff --git a/rott-shareware.appdata.xml b/rott-shareware.appdata.xml new file mode 100644 index 0000000..5332995 --- /dev/null +++ b/rott-shareware.appdata.xml @@ -0,0 +1,32 @@ + + + rott-shareware.desktop + CC0-1.0 + GPL-2.0+ + Rise of the Triad + Apogee's classic 3d first person shooter Rise of the Triad + +

+ This is the icculus.org Linux port of Apogee's classic 3d shooter Rise of + the Triad (RotT), which has been released under the GPL by Apogee. This + version is enhanced with the "high" resolution rendering from the winrott + port. +

+

+ This package contains the engine for the shareware version of RotT. + In order to play the shareware version, you will need the shareware + datafiles. Which can be freely downloaded from Apogee/3DRealms, but + cannot be distributed as a part of Fedora. When you start RotT for the + first time it will offer to download the datafiles for you. +

+ + https://icculus.org/rott/ + + http://image.dosgamesarchive.com/screenshots/risetriad6.gif + http://image.dosgamesarchive.com/screenshots/risetriad1.gif + http://image.dosgamesarchive.com/screenshots/risetriad2.gif + http://image.dosgamesarchive.com/screenshots/risetriad3.gif + http://image.dosgamesarchive.com/screenshots/risetriad5.gif + + jwrdegoede_at_fedoraproject.org + diff --git a/rott-shareware.desktop b/rott-shareware.desktop index 2dff597..ed9830c 100644 --- a/rott-shareware.desktop +++ b/rott-shareware.desktop @@ -1,10 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=Rise of the Triad Comment=RotT Shareware launcher, will automatically download the needed data-files Exec=rott-shareware StartupNotify=false Terminal=false Type=Application -Icon=rott.png +Icon=rott Categories=Game;ActionGame; +Keywords=game;fps;first;person;shooter;rise;triad;rott; diff --git a/rott-shareware.sh b/rott-shareware.sh index 2b8fde9..1e47aa0 100644 --- a/rott-shareware.sh +++ b/rott-shareware.sh @@ -2,6 +2,12 @@ set -e +# game assets installed with game-data-packager +if [ -f /usr/share/rott/REMOTE1.RTS ]; then + cd /usr/share/rott + exec /usr/bin/rott-shareware.bin "$@" +fi + mkdir -p $HOME/.rott cd $HOME/.rott diff --git a/rott.spec b/rott.spec index 3e02994..17c3bf3 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -11,11 +11,13 @@ Source2: rott-registered.sh Source3: rott.autodlrc Source4: rott-shareware.desktop Source5: rott-registered.desktop +Source6: rott-shareware.appdata.xml +Source7: rott-registered.metainfo.xml # Notice this is made from an edited screenshot and thus derived from the non- -# free datafiles. I believe this constitues fair-use. If anyone disagrees let +# free datafiles. I believe this constitutes fair-use. If anyone disagrees let # me know and I'll remove it -Source6: rott.png -BuildRequires: SDL_mixer-devel desktop-file-utils +Source8: rott.png +BuildRequires: SDL_mixer-devel desktop-file-utils libappstream-glib %description This is the icculus.org Linux port of Apogee's classic 3d shooter Rise of the @@ -26,7 +28,7 @@ enhanced with the "high" resolution rendering from the winrott port. %package shareware Summary: Rise of the Triad shareware version Group: Amusements/Games -Requires: hicolor-icon-theme autodownloader +Requires: hicolor-icon-theme autodownloader unzip %description shareware This is the icculus.org Linux port of Apogee's classic 3d shooter Rise of the @@ -93,75 +95,69 @@ install -p -m 644 %{name}-registered.6 $RPM_BUILD_ROOT%{_mandir}/man6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install \ -%if 0%{?fedora} && 0%{?fedora} < 19 - --vendor fedora \ -%endif - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE4} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install \ -%if 0%{?fedora} && 0%{?fedora} < 19 - --vendor fedora \ -%endif - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE5} +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE4} +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE5} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 644 %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.xml mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps -install -p -m 644 %{SOURCE6} \ +install -p -m 644 %{SOURCE8} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/ %post shareware -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun shareware -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans shareware +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %post registered -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun registered -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans registered +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files shareware -%doc README COPYING doc/*.txt +%doc README doc/*.txt +%license COPYING %{_bindir}/rott-shareware* %{_mandir}/man6/%{name}-shareware.6* %{_datadir}/%{name} -%if 0%{?fedora} && 0%{?fedora} < 19 -%{_datadir}/applications/fedora-%{name}-shareware.desktop -%else +%{_datadir}/appdata/%{name}-shareware.appdata.xml %{_datadir}/applications/%{name}-shareware.desktop -%endif %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %files registered -%doc README COPYING doc/*.txt +%doc README doc/*.txt +%license COPYING %{_bindir}/rott-registered* %{_mandir}/man6/%{name}-registered.6* -%if 0%{?fedora} && 0%{?fedora} < 19 -%{_datadir}/applications/fedora-%{name}-registered.desktop -%else +%{_datadir}/appdata/%{name}-registered.metainfo.xml %{_datadir}/applications/%{name}-registered.desktop -%endif %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %changelog +* Sat Jan 16 2016 Hans de Goede - 1.1.2-4 +- Add support for game-data-packager provided assets (rhbz#1295511) +- Add appdata files +- Modernize spec a bit + * Thu Jun 18 2015 Fedora Release Engineering - 1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 376f4db6c37462d5d848b9e0f53622f6c65757bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 22:16:26 +0000 Subject: [PATCH 14/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 17c3bf3..51d443a 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -153,6 +153,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Hans de Goede - 1.1.2-4 - Add support for game-data-packager provided assets (rhbz#1295511) - Add appdata files From 22ce668305b852a6937bafa8a8071d6b8ea30612 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 11:49:20 +0000 Subject: [PATCH 15/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 51d443a..2926efd 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -153,6 +153,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 8c7f375be1047904685d43885cfc7c167baeea2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 13:15:01 +0000 Subject: [PATCH 16/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 2926efd..fb24bb2 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -153,6 +153,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 105751ead30b99d827e261471ccc7d491a4fc22c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 07:46:24 +0000 Subject: [PATCH 17/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index fb24bb2..903f0de 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -153,6 +153,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.1.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 7944249e06760918db2b9a40bb18b7195eefdafe Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:12:46 +0100 Subject: [PATCH 18/40] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- rott.spec | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/rott.spec b/rott.spec index 903f0de..79b89d6 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -104,33 +104,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps install -p -m 644 %{SOURCE8} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/ - -%post shareware -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun shareware -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans shareware -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - -%post registered -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun registered -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans registered -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files shareware %doc README doc/*.txt %license COPYING @@ -153,6 +126,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jan 18 2018 Igor Gnatenko - 1.1.2-9 +- Remove obsolete scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 1.1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From e27cdceea8422fb16c60220e72412a42e23f6371 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 13:16:05 +0000 Subject: [PATCH 19/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 79b89d6..68b38de 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -126,6 +126,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 1.1.2-9 - Remove obsolete scriptlets From 891b6267ec347ccfc22d95437b807bbb8467fb93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:41:55 +0000 Subject: [PATCH 20/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 68b38de..8b30de8 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPLv2+ @@ -126,6 +126,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.1.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From aedd9268dad36451996bbe3eade20d1ef90423f2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:02:05 +0200 Subject: [PATCH 21/40] Add missing BuildRequires on gcc make: cc: Command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1606129 Signed-off-by: Igor Gnatenko --- rott.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rott.spec b/rott.spec index 8b30de8..784f283 100644 --- a/rott.spec +++ b/rott.spec @@ -17,6 +17,7 @@ Source7: rott-registered.metainfo.xml # free datafiles. I believe this constitutes fair-use. If anyone disagrees let # me know and I'll remove it Source8: rott.png +BuildRequires: gcc BuildRequires: SDL_mixer-devel desktop-file-utils libappstream-glib %description From bfeddb643c4ba681308a0094311b4350dd3a5d3a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:21 +0100 Subject: [PATCH 22/40] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- rott.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/rott.spec b/rott.spec index 784f283..3f5feee 100644 --- a/rott.spec +++ b/rott.spec @@ -2,7 +2,6 @@ Name: rott Version: 1.1.2 Release: 11%{?dist} Summary: Rise of the Triad -Group: Amusements/Games License: GPLv2+ URL: http://icculus.org/rott/ Source0: http://icculus.org/rott/releases/rott-%{version}.tar.gz @@ -28,7 +27,6 @@ enhanced with the "high" resolution rendering from the winrott port. %package shareware Summary: Rise of the Triad shareware version -Group: Amusements/Games Requires: hicolor-icon-theme autodownloader unzip %description shareware @@ -45,7 +43,6 @@ the datafiles for you. %package registered Summary: Rise of the Triad registered version -Group: Amusements/Games Requires: hicolor-icon-theme zenity %description registered From 132d4182b51bc0250138f6661329892978063748 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 11:32:37 +0000 Subject: [PATCH 23/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 3f5feee..4f84e62 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -124,6 +124,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.1.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.1.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 237ddaeb6aea216a4c6568f16dcade25a485aa64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 18:43:27 +0000 Subject: [PATCH 24/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 4f84e62..c1a645f 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -124,6 +124,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 1.1.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 67aaaa84914b356c229e52230e8834a11137c2aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 17:48:58 +0000 Subject: [PATCH 25/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index c1a645f..3a5b8b9 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -124,6 +124,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.1.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 0aa2a579b6180d2f6d984caa40aebc5ded1f4153 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:52:43 +0000 Subject: [PATCH 26/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 3a5b8b9..a869843 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -124,6 +124,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 1.1.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4dcb62ca2a8bc4f58d1fe10337f6bf2725a71fb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 07:54:30 +0000 Subject: [PATCH 27/40] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index a869843..9f9f0c6 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -124,6 +124,10 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.1.2-16 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.1.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3137bfd2d2121fa5192bc87fc69d359e1dac6463 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 20:52:23 +0000 Subject: [PATCH 28/40] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- rott.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rott.spec b/rott.spec index 9f9f0c6..ae40757 100644 --- a/rott.spec +++ b/rott.spec @@ -16,6 +16,7 @@ Source7: rott-registered.metainfo.xml # free datafiles. I believe this constitutes fair-use. If anyone disagrees let # me know and I'll remove it Source8: rott.png +BuildRequires: make BuildRequires: gcc BuildRequires: SDL_mixer-devel desktop-file-utils libappstream-glib From 2bcad95b807050e2b257d09a50d90b693b691c22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:24:46 +0000 Subject: [PATCH 29/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index ae40757..f3d3119 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 1.1.2-16 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 08618b1663a6b5cc99fc1644d4ff0143c4ccd8ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:32:55 +0000 Subject: [PATCH 30/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index f3d3119..33f9ec8 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.1.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2a45147268c5bdaa67fddf0da78c05cf5ec8bc24 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 17:58:38 +0000 Subject: [PATCH 31/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 33f9ec8..2309da9 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.1.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1a0ca127152181f8105d84034c9d3499e5c2f2a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 00:58:25 +0000 Subject: [PATCH 32/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 2309da9..60ffb1e 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.1.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 977df4b91fc3db80147c803d38f29d08fd2f9a61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 19:54:10 +0000 Subject: [PATCH 33/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 60ffb1e..7848605 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.1.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.1.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0536ab1e553f32c4bc312d522cee0b17520eb392 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 17:01:38 +0000 Subject: [PATCH 34/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 7848605..adcf380 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.1.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 1.1.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 63875831f019120530da69739d46902b954b3d8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 11:54:30 +0000 Subject: [PATCH 35/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index adcf380..da3803c 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.1.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f636c7dcd642b522ad978b1991e2e820df2b728c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 15:43:39 +0000 Subject: [PATCH 36/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index da3803c..9797ff6 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1.1.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.1.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b1f72f53d67d82b13727cc6257aadd690594c2fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 18:45:40 +0000 Subject: [PATCH 37/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 9797ff6..bac10f0 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Rise of the Triad License: GPLv2+ URL: http://icculus.org/rott/ @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 1.1.2-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a2b4d37d43e7980ebaeec4ad4d8b3b78b988ae57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 02:41:43 +0200 Subject: [PATCH 38/40] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- rott.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rott.spec b/rott.spec index bac10f0..1bab2ff 100644 --- a/rott.spec +++ b/rott.spec @@ -1,8 +1,9 @@ Name: rott Version: 1.1.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Rise of the Triad -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://icculus.org/rott/ Source0: http://icculus.org/rott/releases/rott-%{version}.tar.gz Source1: rott-shareware.sh @@ -125,6 +126,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.1.2-26 +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 1.1.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ec3f4b7c23abc3984cbe28a6612869e54792a0bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 22:38:31 +0000 Subject: [PATCH 39/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 1bab2ff..a06af34 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Rise of the Triad # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -126,6 +126,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 1.1.2-26 - convert license to SPDX From 4a1dd0120a390d4509f613c88156ca7f29b53a0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:04:43 +0000 Subject: [PATCH 40/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rott.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index a06af34..128cd19 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.1.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Rise of the Triad # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -126,6 +126,9 @@ install -p -m 644 %{SOURCE8} \ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.1.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 1.1.2-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild