The package rpms/wesnoth.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/wesnoth.git/commit/?id=9370e0a5f0....
Change:
-ExcludeArch: ppc64le
Thanks.
Full change:
============
commit 9370e0a5f09c59a41de5dd9ad550e63a6e3ef3ad
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Feb 27 03:05:23 2019 +0100
Enable ppc64le build again
It seems to build fine now.
diff --git a/wesnoth.spec b/wesnoth.spec
index e7e73f5..32f9f13 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -12,8 +12,6 @@ Source0:
http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
Source1: wesnothd.service
Source2: %{name}.sysconfig
-ExcludeArch: ppc64le
-
Requires: wesnoth-data = %{version}
BuildRequires: gcc-c++
BuildRequires: SDL2_image-devel
@@ -172,6 +170,7 @@ done
%changelog
* Tue Feb 26 2019 Kalev Lember <klember(a)redhat.com> - 1.14.6-1
- Update to 1.14.6
+- Enable ppc64le build again
* Thu Feb 14 2019 Kalev Lember <klember(a)redhat.com> - 1.14.5-3
- Add missing dbus-devel and readline-devel BRs for optional features
commit 71cc4d6b1a04c44ad6d95b747d378afe965f26a0
Author: Kalev Lember <klember(a)redhat.com>
Date: Tue Feb 26 23:23:51 2019 +0100
Update to 1.14.6
diff --git a/.gitignore b/.gitignore
index 740a576..6a6417a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ wesnoth-1.8.4.tar.bz2
/wesnoth-1.14.3.tar.bz2
/wesnoth-1.14.4.tar.bz2
/wesnoth-1.14.5.tar.bz2
+/wesnoth-1.14.6.tar.bz2
diff --git a/sources b/sources
index 206d636..c6bc2b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wesnoth-1.14.5.tar.bz2) =
2653cfef45afe02215ddf03c549115e4de1516154d00fe82b8c58eb59bcbe8ee5e1ea8bd46333e3d6d8822a0e75ac9490844010afaaefb000260c1c8356e828d
+SHA512 (wesnoth-1.14.6.tar.bz2) =
edb38c907a98286c6865c9b4e18d1f6be41f7597d1124e7c352f9d7c4ab7300abb20d35bab9a7315cd37628777a41985bda579904a9dc1052083585035bd4e28
diff --git a/wesnoth-boost169.patch b/wesnoth-boost169.patch
deleted file mode 100644
index 0c3ac2e..0000000
--- a/wesnoth-boost169.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c161d649cdacfba4b7d4597d0af0e07b3deda908 Mon Sep 17 00:00:00 2001
-From: Wedge009 <wedge009(a)wedge009.net>
-Date: Thu, 27 Dec 2018 08:15:03 +1100
-Subject: [PATCH] Use explicit casts to accommodate changes to boost's tribool
- in 1.69.
-
-(fixes #3646)
----
- src/units/frame.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/units/frame.cpp b/src/units/frame.cpp
-index 8169c5f75785..271b8915d04c 100644
---- a/src/units/frame.cpp
-+++ b/src/units/frame.cpp
-@@ -460,15 +460,15 @@ std::vector<std::string>
frame_parsed_parameters::debug_strings() const
- }
-
- if(!boost::indeterminate(auto_vflip_)) {
-- v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_));
-+ v.emplace_back("auto_vflip=" +
utils::bool_string(static_cast<bool>(auto_vflip_)));
- }
-
- if(!boost::indeterminate(auto_hflip_)) {
-- v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_));
-+ v.emplace_back("auto_hflip=" +
utils::bool_string(static_cast<bool>(auto_hflip_)));
- }
-
- if(!boost::indeterminate(primary_frame_)) {
-- v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_));
-+ v.emplace_back("primary_frame=" +
utils::bool_string(static_cast<bool>(primary_frame_)));
- }
-
- if(!drawing_layer_.get_original().empty()) {
-@@ -772,7 +772,7 @@ const frame_parameters unit_frame::merge_parameters(int current_time,
const fram
- }
-
- // Convert the tribool to bool
-- const bool primary = result.primary_frame == true ||
boost::logic::indeterminate(result.primary_frame);
-+ const bool primary = static_cast<bool>(result.primary_frame) ||
boost::logic::indeterminate(result.primary_frame);
-
- /** The engine provides a default image to use for the unit when none is available */
- result.image = current_val.image.is_void() || current_val.image.get_filename().empty()
diff --git a/wesnoth.spec b/wesnoth.spec
index 034d9b1..e7e73f5 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -2,19 +2,15 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e
's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
Name: wesnoth
-Version: 1.14.5
-Release: 3%{?dist}
+Version: 1.14.6
+Release: 1%{?dist}
Summary: Turn-based strategy game with a fantasy theme
License: GPLv2+
URL:
http://www.wesnoth.org
Source0:
http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
-#Source0: wesnoth-795624ab4e.tar.gz
Source1: wesnothd.service
Source2: %{name}.sysconfig
-# Fix the build with boost 1.69
-#
https://github.com/wesnoth/wesnoth/commit/c161d649cdacfba4b7d4597d0af0e07...
-Patch0: wesnoth-boost169.patch
ExcludeArch: ppc64le
@@ -174,6 +170,9 @@ done
%{_mandir}/*/man6/wesnoth*.6*
%changelog
+* Tue Feb 26 2019 Kalev Lember <klember(a)redhat.com> - 1.14.6-1
+- Update to 1.14.6
+
* Thu Feb 14 2019 Kalev Lember <klember(a)redhat.com> - 1.14.5-3
- Add missing dbus-devel and readline-devel BRs for optional features
- Fix dejavu font unbundling