The package rpms/springlobby.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/springlobby.git/commit/?id=460755....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit 460755fd418a3d921a65acc1417131ff90168f6d
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Thu Jun 4 00:04:25 2020 +0300
Update to 0.269
Fix compilation with GCC 10 | GH-951
Unbundle 'minizip'
Add new BR: jsoncpp-devel, libnotify-devel, minizip-compat-devel, ninja-build
Add new weak dep: fluidsynth-libs
Add AppStream data and desktop file validation
Update URL and sources link, now using HTTPS
Replace tabs with spaces
Switch to Ninja build
SPEC file optimizations
diff --git a/.gitignore b/.gitignore
index c76b59f..f9753fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/springlobby-0.195.tar.bz2
/springlobby-0.267.tar.bz2
+/springlobby-0.269.tar.bz2
diff --git a/gcc10.patch b/gcc10.patch
index dfda41f..c2462e0 100644
--- a/gcc10.patch
+++ b/gcc10.patch
@@ -1,11 +1,34 @@
-diff -Nrup a/src/utils/sortutil.h b/src/utils/sortutil.h
---- a/src/utils/sortutil.h 2018-09-04 15:36:54.000000000 -0600
-+++ b/src/utils/sortutil.h 2019-09-23 10:22:00.403342300 -0600
+From 2bef0fb68bb6ed673fd05f7b7f7f96dd704201c4 Mon Sep 17 00:00:00 2001
+From: Logan Bateman <lbateman0199(a)gmail.com>
+Date: Tue, 2 Jun 2020 12:59:50 -0400
+Subject: [PATCH] Explicitly include std::string - small build fix
+
+---
+ src/battlelist.h | 1 +
+ src/utils/sortutil.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/battlelist.h b/src/battlelist.h
+index f2470fe03..e7c49ee29 100644
+--- a/src/battlelist.h
++++ b/src/battlelist.h
+@@ -16,6 +16,7 @@ lsl/container/battlelist.h
+
+
+ #include <map>
++#include <string>
+ #include "utils/mixins.h"
+
+ class IBattle;
+diff --git a/src/utils/sortutil.h b/src/utils/sortutil.h
+index a91b7f3bb..a0b664451 100644
+--- a/src/utils/sortutil.h
++++ b/src/utils/sortutil.h
@@ -4,6 +4,7 @@
#define SPRINGLOBBY_SORTUTIL_H_INCLUDED
#include <map>
+#include <string>
//! set direction to +1 for down, -1 for up
- struct SortOrderItem
- {
+ struct SortOrderItem {
+ int col;
diff --git a/sources b/sources
index e732bc2..ffcef41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (springlobby-0.267.tar.bz2) =
6127bd7377f9a843b23df6dae7a07af1122f6ec5fa13cd8d16c0c7a3cc84e1f7af2fb7df929f904ee0b4e3abf12ae1e525ffb39b2afa0215433209054cf0de5f
+SHA512 (springlobby-0.269.tar.bz2) =
32e9b5bfc72bcfccd1487621e6035e7338977f7262702cd39ec2c43734bff5b8757a97428d1207f8e6721dd450c1cddd68e43cea416503dd1987596e61e126e1
diff --git a/springlobby.spec b/springlobby.spec
index 5a4efd6..90e50c9 100644
--- a/springlobby.spec
+++ b/springlobby.spec
@@ -1,74 +1,108 @@
-Name: springlobby
-Version: 0.267
-Release: 7%{?dist}
-Summary: A lobby client for the spring RTS game engine
+# Colorize terminal output. Helps to find problems during build process.
+%global optflags %{optflags} -fdiagnostics-color=always
+
+Name: springlobby
+Version: 0.269
+Release: 1%{?dist}
+Summary: Free cross-platform lobby client for the Spring RTS project
# License clarification:
http://springlobby.info/issues/show/810
-License: GPLv2
-URL:
http://springlobby.info
-Source0:
http://www.springlobby.info/tarballs/springlobby-%{version}.tar.bz2
-Patch0: gcc10.patch
+License: GPLv2
+URL:
https://springlobby.springrts.com/
+Source0:
https://springlobby.springrts.com/dl/stable/springlobby-%{version}.tar.bz2
+ExclusiveArch: %{ix86} x86_64
+
+# Build fails with new GCC 10
+# *
https://github.com/springlobby/springlobby/issues/951
+Patch0:
https://github.com/springlobby/springlobby/pull/958.patch#/gcc10.patch
-BuildRequires: SDL-devel
-BuildRequires: SDL_mixer-devel
-BuildRequires: SDL_sound-devel
BuildRequires: alure-devel
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: dumb-devel
-BuildRequires: gcc-c++
+BuildRequires: gcc-c++ >= 8
BuildRequires: gettext
+BuildRequires: libappstream-glib
BuildRequires: libcurl-devel
+BuildRequires: libnotify-devel
+BuildRequires: minizip-compat-devel
+BuildRequires: ninja-build
BuildRequires: openal-devel
BuildRequires: rb_libtorrent-devel
+BuildRequires: SDL_mixer-devel
+BuildRequires: SDL_sound-devel
+BuildRequires: SDL-devel
BuildRequires: wxGTK3-devel
-# There are other "lobbies" for spring, make a virtual-provides
-Provides: spring-lobby = %{version}-%{release}
+#
https://github.com/springlobby/springlobby/issues/709
+BuildRequires: jsoncpp-devel
-Requires: hicolor-icon-theme
-Requires: mesa-libGLU%{?_isa}
+Requires: hicolor-icon-theme
+Requires: mesa-libGLU%{?_isa}
-Recommends: spring%{?_isa}
+Recommends: fluidsynth-libs%{?_isa}
+Recommends: spring%{?_isa}
-ExclusiveArch: %{ix86} x86_64
+# There are other "lobbies" for spring, make a virtual-provides
+Provides: spring-lobby = %{version}-%{release}
%description
SpringLobby is a free cross-platform lobby client for the Spring RTS project.
+
%prep
%autosetup -p1
+mkdir -p %{_target_platform}
+
+# Unbunle libs
+rm -rf \
+ src/downloader/lib/src/lib/minizip
+
%build
-%cmake
-%make_build
+pushd %{_target_platform}
+%cmake \
+ -G Ninja \
+ ..
+popd
+%ninja_build -C %{_target_platform}
+
%install
-%make_install
+%ninja_install -C %{_target_platform}
+%find_lang %{name}
+rm -rf %{buildroot}%{_docdir}/%{name}/COPYING
-# Useless file
-rm -f $RPM_BUILD_ROOT%{_prefix}/config.h
-# Fix Icon entry
-sed -i -e 's/^Icon=\(.*\).svg/Icon=\1/g' \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-category Application \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-%find_lang %{name}
%files -f %{name}.lang
-%{_pkgdocdir}
-%{_bindir}/*
-%{_metainfodir}/*.appdata.xml
+%license COPYING
+%doc ChangeLog
+%{_bindir}/%{name}
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_docdir}/%{name}/
+%{_metainfodir}/*.xml
+
%changelog
+* Wed Jun 03 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.269-1
+- Update to 0.269
+- Fix compilation with GCC 10 | GH-951
+- Unbundle 'minizip'
+- Add new BR: jsoncpp-devel, libnotify-devel, minizip-compat-devel, ninja-build
+- Add new weak dep: fluidsynth-libs
+- Add AppStream data and desktop file validation
+- Update URL and sources link, now using HTTPS
+- Replace tabs with spaces
+- Switch to Ninja build
+- SPEC file optimizations
+
* Fri May 29 2020 Jonathan Wakely <jwakely(a)redhat.com> - 0.267-7
- Rebuilt for Boost 1.73
@@ -252,7 +286,7 @@ desktop-file-install \
* Tue May 04 2010 Aurelien Bompard <abompard(a)fedoraproject.org> - 0.79-1
- version 0.79
- add patch to fix DSO linking
- (
http://fedoraproject.org/wiki/UnderstandingDSOLinkChange)
+ (
http://fedoraproject.org/wiki/UnderstandingDSOLinkChange)
* Sun May 02 2010 Aurelien Bompard <abompard(a)fedoraproject.org> - 0.78-1
- version 0.78
@@ -276,7 +310,7 @@ desktop-file-install \
- version 0.35
* Sun Oct 11 2009 Aurelien Bompard <abompard(a)fedoraproject.org> - 0.27-1
-- version 0.27
+- version 0.27
* Mon Sep 14 2009 Aurelien Bompard <abompard(a)fedoraproject.org> - 0.23-1
- version 0.23