$ git diff --patch-with-stat --summary 1e9cf5c193b467db312f04e76958bf109173d02f..733cf415fd75a2e763d79437f1978fdaf29ba45b
.abf.yml | 2 ++
freeorion-static-helper-libs.patch | 55 -------------------------------------
freeorion.png | Bin 49427 -> 0 bytes
freeorion.spec | 16 +++++------
4 files changed, 10 insertions(+), 63 deletions(-)
delete mode 100644 freeorion-static-helper-libs.patch
delete mode 100644 freeorion.png
diff --git a/.abf.yml b/.abf.yml
index e9370f0..e6deebc 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,4 @@
sources:
FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz: 6e5e392991cd495a073764080278bc968349eaad
+ freeorion.png: 3f13e13f24a68da7b0732dd859bb82ee638f51c2
+ freeorion-0.4.10.1.tar.gz: 839643338cebcc367382d6509ff518d18fd1c6b1
diff --git a/freeorion-static-helper-libs.patch b/freeorion-static-helper-libs.patch
deleted file mode 100644
index 450392c..0000000
--- a/freeorion-static-helper-libs.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -up src-tarball/CMakeLists.txt.omv~ src-tarball/CMakeLists.txt
---- src-tarball/CMakeLists.txt.omv~ 2020-02-10 23:26:37.715005496 +0100
-+++ src-tarball/CMakeLists.txt 2020-02-10 23:28:01.520000008 +0100
-@@ -358,14 +358,9 @@ if(Apple)
- )
- endif()
-
--if(NOT WIN32)
-- add_library(freeorioncommon "")
--endif()
--
-+add_library(freeorioncommon STATIC "")
-
- if(WIN32)
-- add_library(freeorioncommon STATIC "")
--
- set_property(TARGET freeorioncommon
- PROPERTY
- OUTPUT_NAME Common
-@@ -468,13 +463,9 @@ target_compile_definitions(freeorionpars
- -DFREEORION_BUILD_PARSE
- )
-
--if(NOT WIN32)
-- add_library(freeorionparse $<TARGET_OBJECTS:freeorionparseobj>)
--endif()
-+add_library(freeorionparse STATIC $<TARGET_OBJECTS:freeorionparseobj>)
-
- if(WIN32)
-- add_library(freeorionparse STATIC $<TARGET_OBJECTS:freeorionparseobj>)
--
- set_property(TARGET freeorionparse
- PROPERTY
- OUTPUT_NAME Parsers
-diff -up src-tarball/GG/CMakeLists.txt.omv~ src-tarball/GG/CMakeLists.txt
---- src-tarball/GG/CMakeLists.txt.omv~ 2020-02-10 15:34:50.970859068 +0100
-+++ src-tarball/GG/CMakeLists.txt 2020-02-10 15:35:51.559855101 +0100
-@@ -136,7 +136,7 @@ configure_file(
- ## Define main project targets.
- ##
-
--add_library(GiGi "")
-+add_library(GiGi STATIC "")
-
- if(USE_STATIC_LIBS)
- set_target_properties(GiGi
-@@ -182,7 +182,7 @@ if(TIFF_FOUND)
- endif()
-
-
--add_library(GiGiSDL "")
-+add_library(GiGiSDL STATIC "")
-
- if(USE_STATIC_LIBS)
- set_target_properties(GiGiSDL
diff --git a/freeorion.png b/freeorion.png
deleted file mode 100644
index 09e4f4b..0000000
Binary files a/freeorion.png and /dev/null differ
diff --git a/freeorion.spec b/freeorion.spec
index b91104d..f2cb3cd 100644
--- a/freeorion.spec
+++ b/freeorion.spec
@@ -6,22 +6,22 @@
Summary: Turn-based space empire and galactic conquest
Name: freeorion
-Version: 0.4.9
+Version: 0.4.10.1
Release: 1
License: GPLv2+
Group: Games/Strategy
Url: http://www.freeorion.org
-Source0: https://github.com/freeorion/freeorion/releases/download/v%{version}/FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz
+Source0: https://github.com/freeorion/freeorion/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.png
-Patch0: freeorion-static-helper-libs.patch
+
Requires: %{name}-data = %{version}
Requires: ogre
BuildRequires: cmake
BuildRequires: boost-devel
-BuildRequires: boost-python2-devel
+BuildRequires: boost-python-devel
BuildRequires: jpeg-devel
-BuildRequires: pkgconfig(python2)
+BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(bullet)
BuildRequires: pkgconfig(freealut)
BuildRequires: pkgconfig(freetype2)
@@ -68,7 +68,7 @@ Data files for FreeOrion game
#----------------------------------------------------------------------------
%prep
-%autosetup -p1 -n src-tarball
+%autosetup -p1
%build
sed -e "s/-O3//" -i CMakeLists.txt
@@ -79,11 +79,11 @@ export LDFLAGS="%{ldflags} -Wl,--as-needed"
%cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DPYTHON_EXECUTABLE=%{_bindir}/python2 \
+ -DPYTHON_EXECUTABLE=%{_bindir}/python \
-DRELEASE_COMPILE_FLAGS="%{optflags}" \
-DBUILD_SHARED_LIBS=OFF
-%make VERBOSE=1
+%make_build VERBOSE=1
%install
install -d -m 755 %{buildroot}%{_gamesbindir}