rpms/0ad
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: rpms:master
Branches Tags
rpms:master
rpms:f29
rpms:f27
rpms:f28
rpms:epel7
rpms:f26
rpms:f25
rpms:f24
rpms:f23
rpms:f21
rpms:f22
rpms:f20
rpms:f19
rpms:f18
rpms:f17
rpms:f16
..
compare: rpms:f25
Branches Tags
rpms:f29
rpms:master
rpms:f27
rpms:f28
rpms:epel7
rpms:f26
rpms:f25
rpms:f24
rpms:f23
rpms:f21
rpms:f22
rpms:f20
rpms:f19
rpms:f18
rpms:f17
rpms:f16

No commits in common. "master" and "f25" have entirely different histories.
master ... f25

5 changed files with 14 additions and 92 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,4 +4,3 @@
/0ad-0.0.20-alpha-unix-build.tar.xz
/0ad-0.0.21-alpha-unix-build.tar.xz
/0ad-0.0.22-alpha-unix-build.tar.xz
/0ad-0.0.23-alpha-unix-build.tar.xz

38
0ad-rpath.patch
View File

@ -1,7 +1,7 @@
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 0ad-0.0.23-alpha/build/premake/premake4.lua
--- 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 2018-04-29 17:44:48.000000000 +0200
+++ 0ad-0.0.23-alpha/build/premake/premake4.lua 2018-05-22 13:23:25.238894337 +0200
@@ -356,26 +356,6 @@
diff -uNr 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 0ad-0.0.21-alpha/build/premake/premake4.lua
--- 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 2016-09-18 10:54:27.000000000 +0200
+++ 0ad-0.0.21-alpha/build/premake/premake4.lua 2016-11-09 06:47:02.330099676 +0100
@@ -368,26 +368,6 @@
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
end
@ -28,33 +28,3 @@ diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 0ad-0.0.23-alpha/buil
end
end
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 0ad-0.0.23-alpha/build/premake/premake5.lua
--- 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 2018-04-22 20:14:45.000000000 +0200
+++ 0ad-0.0.23-alpha/build/premake/premake5.lua 2018-05-22 13:23:29.022903711 +0200
@@ -344,26 +344,6 @@
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
end
- if os.istarget("linux") or os.istarget("bsd") then
- -- To use our local shared libraries, they need to be found in the
- -- runtime dynamic linker path. Add their path to -rpath.
- if _OPTIONS["libdir"] then
- linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] }
- else
- -- On FreeBSD we need to allow use of $ORIGIN
- if os.istarget("bsd") then
- linkoptions { "-Wl,-z,origin" }
- end
-
- -- Adding the executable path and taking care of correct escaping
- if _ACTION == "gmake" then
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
- elseif _ACTION == "codeblocks" then
- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
- end
- end
- end
-
end
end

20
0ad-valgrind.patch
View File

@ -1,7 +1,7 @@
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/extern_libs4.lua 0ad-0.0.23-alpha/build/premake/extern_libs4.lua
--- 0ad-0.0.23-alpha.orig/build/premake/extern_libs4.lua 2018-04-08 23:41:31.000000000 +0200
+++ 0ad-0.0.23-alpha/build/premake/extern_libs4.lua 2018-05-22 13:24:21.468033629 +0200
@@ -655,7 +655,7 @@
diff -up build/premake/extern_libs4.lua.orig build/premake/extern_libs4.lua
--- build/premake/extern_libs4.lua.orig 2015-03-14 13:30:48.483874704 -0300
+++ build/premake/extern_libs4.lua 2015-03-14 13:31:20.540875931 -0300
@@ -668,7 +668,7 @@ extern_lib_defs = {
},
valgrind = {
compile_settings = function()
@ -10,15 +10,3 @@ diff -uNr 0ad-0.0.23-alpha.orig/build/premake/extern_libs4.lua 0ad-0.0.23-alpha/
end,
},
vorbis = {
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/extern_libs5.lua 0ad-0.0.23-alpha/build/premake/extern_libs5.lua
--- 0ad-0.0.23-alpha.orig/build/premake/extern_libs5.lua 2018-04-29 17:44:48.000000000 +0200
+++ 0ad-0.0.23-alpha/build/premake/extern_libs5.lua 2018-05-22 13:24:21.468033629 +0200
@@ -620,7 +620,7 @@
},
valgrind = {
compile_settings = function()
- add_source_include_paths("valgrind")
+ pkgconfig.add_includes("valgrind")
end,
},
vorbis = {

45
0ad.spec
View File

@ -18,8 +18,8 @@
%bcond_without nvtt
Name: 0ad
Version: 0.0.23
Release: 3%{?dist}
Version: 0.0.22
Release: 1%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@ -71,7 +71,6 @@ BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: enet-devel
BuildRequires: gamin-devel
BuildRequires: gcc-c++
BuildRequires: gloox-devel
BuildRequires: libcurl-devel
BuildRequires: libdnet-devel
@ -83,19 +82,17 @@ BuildRequires: libxml2-devel
BuildRequires: libzip-devel
BuildRequires: miniupnpc-devel
BuildRequires: mozjs38-devel
BuildRequires: libsodium-devel
%if %{with system_nvtt}
BuildRequires: nvidia-texture-tools-devel
%endif
BuildRequires: openal-soft-devel
BuildRequires: openjpeg-devel
BuildRequires: pkgconfig
BuildRequires: python2
BuildRequires: python
BuildRequires: SDL2-devel
BuildRequires: subversion
BuildRequires: valgrind-devel
BuildRequires: wxGTK3-devel
BuildRequires: /usr/bin/python
BuildRequires: wxGTK-devel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
@ -133,7 +130,7 @@ hobbyist game developers, since 2001.
# disable debug build, and "int 0x3" to trap to debugger (x86 only)
%patch1 -p0
%endif
%patch3 -p1
%patch3 -p0
%patch4 -p1
%if %{with system_nvtt}
@ -235,38 +232,6 @@ export STRIP=/bin/true
%{_mandir}/man6/*.6*
%changelog
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.23-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 0.0.23-2
- Rebuild for ICU 62
* Thu May 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.23-1
- Update to 0.0.23
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 0.0.22-8
- Rebuild for ICU 61.1
* Wed Mar 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.0.22-7
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 0.0.22-6
- Rebuild to fix GCC 8 mis-compilation
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.22-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 22 2018 Jonathan Wakely <jwakely@redhat.com> - 0.0.22-4
- Rebuilt for Boost 1.66
* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 0.0.22-3
- Rebuild for ICU 60.1
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.22-1
- Update to 0.0.22

2
sources
View File

@ -1 +1 @@
SHA512 (0ad-0.0.23-alpha-unix-build.tar.xz) = 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
SHA512 (0ad-0.0.22-alpha-unix-build.tar.xz) = 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771