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
commit ec39fb2c4c58e3e30d92e7b763090bba549c0b49
Author: Kalev Lember <klember(a)redhat.com>
Date: Thu Feb 14 08:12:08 2019 +0100
Fix dejavu font unbundling
- Drop obsolete sazanami-gothic and wqy-zenhei font deps
diff --git a/wesnoth.spec b/wesnoth.spec
index 12f0033..034d9b1 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -86,8 +86,6 @@ This package contains the game editor and development tools.
Summary: %{summary}
Requires: %{name} = %{version}
Requires: dejavu-sans-fonts
-Requires: sazanami-gothic-fonts
-Requires: wqy-zenhei-fonts
BuildArch: noarch
%description data
@@ -124,14 +122,10 @@ mv $RPM_BUILD_ROOT/%{_bindir}/wesnothd $RPM_BUILD_ROOT/%{_sbindir}
mv $RPM_BUILD_ROOT/%{_bindir}/campaignd $RPM_BUILD_ROOT/%{_sbindir}
# Wesnoth ships its own fonts, replace with Fedora packaged versions
-rm -f $RPM_BUILD_ROOT/%{_datadir}/fonts/*
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/fonts
-# dejavu-fonts
-ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf
$RPM_BUILD_ROOT/%{_datadir}/fonts/DejaVuSans.ttf
-# sazanami-fonts-gothic
-ln -s /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
$RPM_BUILD_ROOT/%{_datadir}/fonts/sazanami-gothic.t
-# wqy-zenhei-fonts
-ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc
$RPM_BUILD_ROOT/%{_datadir}/fonts/wqy-zenhei.ttc
+for f in dejavu/DejaVuSans-Bold.ttf dejavu/DejaVuSansMono-Bold.ttf
dejavu/DejaVuSansMono.ttf dejavu/DejaVuSans-Oblique.ttf dejavu/DejaVuSans.ttf ; do
+ rm $RPM_BUILD_ROOT%{_datadir}/wesnoth/fonts/$(basename $f)
+ ln -s /usr/share/fonts/$f $RPM_BUILD_ROOT%{_datadir}/wesnoth/fonts/$(basename $f)
+done
# language stuff
%find_lang %{name} LANGFILES --with-man
@@ -173,7 +167,6 @@ ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc
$RPM_BUILD_ROOT/%{_datadir}/fon
%files data -f LANGFILES
%{_datadir}/%{name}
%{_datadir}/applications/wesnoth.desktop
-%{_datadir}/fonts/*
%{_datadir}/icons/*
%{_datadir}/metainfo/wesnoth.appdata.xml
%{python2_sitelib}/wesnoth
@@ -183,6 +176,8 @@ ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc
$RPM_BUILD_ROOT/%{_datadir}/fon
%changelog
* 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
+- Drop obsolete sazanami-gothic and wqy-zenhei font deps
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.14.5-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 10214bf4a5c0ccad90f663b0d5e4b369f7480441
Author: Kalev Lember <klember(a)redhat.com>
Date: Thu Feb 14 07:51:25 2019 +0100
Add missing dbus-devel and readline-devel BRs for optional features
diff --git a/wesnoth.spec b/wesnoth.spec
index a2f4635..12f0033 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -3,7 +3,7 @@
Name: wesnoth
Version: 1.14.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Turn-based strategy game with a fantasy theme
License: GPLv2+
@@ -24,6 +24,7 @@ BuildRequires: SDL2_image-devel
BuildRequires: SDL2_mixer-devel
BuildRequires: SDL2_net-devel
BuildRequires: SDL2_ttf-devel
+BuildRequires: dbus-devel
BuildRequires: freetype-devel
BuildRequires: libpng-devel
BuildRequires: fribidi-devel
@@ -35,6 +36,7 @@ BuildRequires: gettext
BuildRequires: boost-devel
BuildRequires: pango-devel
BuildRequires: lua-devel
+BuildRequires: readline-devel
BuildRequires: scons
BuildRequires: openssl-devel
BuildRequires: libvorbis-devel
@@ -179,6 +181,9 @@ ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc
$RPM_BUILD_ROOT/%{_datadir}/fon
%{_mandir}/*/man6/wesnoth*.6*
%changelog
+* 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
+
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.14.5-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 662a5e84706d3296d9f5298c31e34a04fcd9ef48
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Feb 13 19:47:04 2019 +0100
Use globs for man pages
... so that we don't hardcode the compression format.
diff --git a/wesnoth.spec b/wesnoth.spec
index 08d7eb2..a2f4635 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -175,8 +175,8 @@ ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc
$RPM_BUILD_ROOT/%{_datadir}/fon
%{_datadir}/icons/*
%{_datadir}/metainfo/wesnoth.appdata.xml
%{python2_sitelib}/wesnoth
-%{_mandir}/man6/wesnoth*.6.gz
-%{_mandir}/*/man6/wesnoth*.6.gz
+%{_mandir}/man6/wesnoth*.6*
+%{_mandir}/*/man6/wesnoth*.6*
%changelog
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.14.5-2
commit c85839084c774ed0f4a6bc01a3facd4757434b30
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Feb 13 19:46:46 2019 +0100
Use python2_sitelib macro instead of python_sitelib
diff --git a/wesnoth.spec b/wesnoth.spec
index 70ef68e..08d7eb2 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -102,7 +102,7 @@ scons wesnoth wesnothd campaignd prefix=%{_prefix} \
boostdir=%{_includedir} \
boostlibdir=%{_libdir} \
localedirname=locale \
- python_site_packages_dir=%{python_sitelib}/%{name} \
+ python_site_packages_dir=%{python2_sitelib}/wesnoth \
extra_flags_release="$RPM_OPT_FLAGS $RPM_LD_FLAGS" \
%{?_smp_mflags}
commit 6ca5c01b1fdce27b1d45c9df6f5275ed6ac5ce8a
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Feb 13 15:11:20 2019 +0100
Fix boost detection when building for flatpak
diff --git a/wesnoth.spec b/wesnoth.spec
index 021fa79..70ef68e 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -99,6 +99,8 @@ This package contains the data files for Wesnoth.
scons wesnoth wesnothd campaignd prefix=%{_prefix} \
bindir=%{_bindir} \
libdir=%{_libdir} \
+ boostdir=%{_includedir} \
+ boostlibdir=%{_libdir} \
localedirname=locale \
python_site_packages_dir=%{python_sitelib}/%{name} \
extra_flags_release="$RPM_OPT_FLAGS $RPM_LD_FLAGS" \
commit 9b7240e3d3b81460f89a46d3c70dbb148e2ddbed
Author: Kalev Lember <klember(a)redhat.com>
Date: Tue Feb 12 09:10:05 2019 +0100
Fix the build with boost 1.69
diff --git a/wesnoth-boost169.patch b/wesnoth-boost169.patch
new file mode 100644
index 0000000..0c3ac2e
--- /dev/null
+++ b/wesnoth-boost169.patch
@@ -0,0 +1,43 @@
+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 817c790..021fa79 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -12,6 +12,10 @@ 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
Requires: wesnoth-data = %{version}
@@ -89,7 +93,7 @@ This package contains the data files for Wesnoth.
##%endif
%prep
-%setup -q
+%autosetup -p1
%build
scons wesnoth wesnothd campaignd prefix=%{_prefix} \
commit 50ef8e4eef1e61f20c6c78b77a8108252e77543b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Feb 3 11:39:12 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/wesnoth.spec b/wesnoth.spec
index c8f69b1..817c790 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -3,7 +3,7 @@
Name: wesnoth
Version: 1.14.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Turn-based strategy game with a fantasy theme
License: GPLv2+
@@ -173,6 +173,9 @@ ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc
$RPM_BUILD_ROOT/%{_datadir}/fon
%{_mandir}/*/man6/wesnoth*.6.gz
%changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.14.5-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Mon Sep 24 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 1.14.5-1
- 1.14.5.
commit 52e456b97a939c3d98b22b5a5b8803c88cb315b3
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Jan 27 13:20:17 2019 +0100
Remove obsolete scriptlets
References:
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/wesnoth.spec b/wesnoth.spec
index b58d1be..c8f69b1 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -128,18 +128,6 @@ ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc
$RPM_BUILD_ROOT/%{_datadir}/fon
# language stuff
%find_lang %{name} LANGFILES --with-man
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
%pre server
/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
-r -d /var/run/wesnothd wesnothd 2> /dev/null || :