[xonotic] Fix Quake download urls (#1177538)

François Cami fcami at fedoraproject.org
Fri Jan 2 14:55:47 UTC 2015


commit d90d496ea1e069d3351a3455a125f0967ad88c2e
Author: François Cami <fcami at fedoraproject.org>
Date:   Fri Jan 2 15:35:12 2015 +0100

    Fix Quake download urls (#1177538)

 darkplaces-quake.autodlrc |    4 ++--
 xonotic.spec              |   15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/darkplaces-quake.autodlrc b/darkplaces-quake.autodlrc
index f9e0045..1a4c293 100644
--- a/darkplaces-quake.autodlrc
+++ b/darkplaces-quake.autodlrc
@@ -17,8 +17,8 @@ Please click Accept to allow access to the internet to download the necessary da
 	[MD5]663b749612d55de29f74966ec3168918[/MD5]
 	[PATH]$HOME/.darkplaces[/PATH]
 	[MIRRORS]
-		[URL]ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/quake-data/quakesw-1.0.6.tar.gz[/URL]
-		[URL]ftp://ftp.de.freebsd.org/pub/FreeBSD/ports/distfiles/quake-data/quakesw-1.0.6.tar.gz[/URL]
+		[URL]MIRROR1[/URL]
+		[URL]MIRROR2[/URL]
 	[/MIRRORS]
 [/FILE]
 [/FILELIST]
diff --git a/xonotic.spec b/xonotic.spec
index 0c133ac..f7eb68c 100644
--- a/xonotic.spec
+++ b/xonotic.spec
@@ -1,10 +1,13 @@
 %global _hardened_build 1
 %global dpver 20130605
 
+%global dqmirror1 http://distcache.freebsd.org/ports-distfiles/quake-data/quakesw-1.0.6.tar.gz
+%global dqmirror2 https://www.libsdl.org/projects/quake/data/quakesw-1.0.6.tar.gz
+
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: xonotic
 Version: 0.7.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Amusements/Games
 URL: http://www.xonotic.org/
@@ -112,6 +115,11 @@ DarkPlaces server required for hosting multiplayer network Quake games.
 
 %prep
 %setup -q -n darkplaces
+
+cp %{SOURCE11} .
+sed -i 's,MIRROR1,%{dqmirror1},g' $(basename %{SOURCE11})
+sed -i 's,MIRROR2,%{dqmirror2},g' $(basename %{SOURCE11})
+
 sed -i 's/\r//' darkplaces.txt
 sed -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc
 sed -i 's/nexuiz/xonotic/g' makefile makefile.inc
@@ -170,7 +178,7 @@ for i in glx sdl dedicated ; do
     install -Dpm 755 %{SOURCE10} %{buildroot}%{_bindir}/darkplaces-quake-$i
 done
 
-install -Dpm 644 %{SOURCE11} %{buildroot}%{_datadir}/darkplaces/quake.autodlrc
+install -Dpm 644 $(basename %{SOURCE11}) %{buildroot}%{_datadir}/darkplaces/quake.autodlrc
 
 #install -Dpm 755 d0_blind_id/blind_id %{buildroot}%{_bindir}/blind_id
 
@@ -244,6 +252,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Dec 25 2014 François Cami <fcami at fedoraproject.org> - 0.7.0-5
+- Fix darkplaces-quake download urls: use placeholders and variables in spec file.
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list