Hello community,
here is the log from the commit of package hedgewars for openSUSE:Factory
checked in at 2019-06-17 10:33:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hedgewars (Old)
and /work/SRC/openSUSE:Factory/.hedgewars.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hedgewars"
Mon Jun 17 10:33:47 2019 rev:7 rq:710021 version:0.9.25
Changes:
--------
--- /work/SRC/openSUSE:Factory/hedgewars/hedgewars.changes 2019-02-28
21:43:26.121524282 +0100
+++ /work/SRC/openSUSE:Factory/.hedgewars.new.4811/hedgewars.changes
2019-06-17 10:34:19.805234511 +0200
@@ -1,0 +2,12 @@
+Fri Jun 14 16:33:48 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Fix builds on 32bit archs, use CLang+Pas2C instead of FPC
+- Spec file cleanups:
+ * use bcond_with{,out} for disabling/enabling features
+ * remove several unused BuildRequires
+ * remove obsolete xpm icon
+ * use metainfo instead of appdata dir
+ * remove defattr
+ * use %license for Fonts_LICENSE.txt, add COPYING
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hedgewars.spec ++++++
--- /var/tmp/diff_new_pack.EyEAwD/_old 2019-06-17 10:34:21.965233421 +0200
+++ /var/tmp/diff_new_pack.EyEAwD/_new 2019-06-17 10:34:21.965233421 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hedgewars
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,12 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define _no_server 1
-%define _no_ffmpeg 1
+%bcond_with server
+%bcond_with videorec
+
+# FPC (Pascal) engine is disabled on 32bit archs due to a FPC bug
+%ifarch %ix86 %arm %ppc
+%bcond_without engine_c
+%else
+%bcond_with engine_c
+%endif
Name: hedgewars
Version: 0.9.25
@@ -34,33 +41,35 @@
BuildRequires: SDL2_net-devel
BuildRequires: SDL2_ttf-devel
BuildRequires: cmake
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5Gui)
+BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(Qt5Widgets)
BuildRequires: fdupes
+%if %{with engine_c}
+BuildRequires: clang
+BuildRequires: ghc
+BuildRequires: glew-devel
+%else
BuildRequires: fpc
BuildRequires: gcc
BuildRequires: gcc-c++
-BuildRequires: glibc-devel
-BuildRequires: gmp-devel
+%endif
BuildRequires: hicolor-icon-theme
-BuildRequires: libQt5Core-devel
-BuildRequires: libQt5Core-private-headers-devel
-BuildRequires: libQt5Gui-devel
-BuildRequires: libQt5Network-devel
-BuildRequires: libQt5Widgets-devel
-BuildRequires: libffi-devel
BuildRequires: libphysfs-devel >= 3.0
BuildRequires: libpng-devel
+# Required for QAbstractFileEngine*, which is no longer public since Qt5.12
+BuildRequires: libQt5Core-private-headers-devel
BuildRequires: libqt5-linguist-devel
-BuildRequires: lua51-devel
-BuildRequires: lzma
+BuildRequires: pkgconfig(lua5.1)
BuildRequires: shared-mime-info
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
-BuildRequires: pkgconfig(openssl)
Requires: %{name}-data = %{version}
Recommends: %{name}-server = %{version}
# to build server
-%if %{_no_server} == 0
+%if %{with server}
BuildRequires: ghc
BuildRequires: ghc-bytestring-devel
# BuildRequires: ghc-dataenc-devel
@@ -96,7 +105,6 @@
This package contains all the data files for hedgewars.
-%if %{_no_server} == 0
%package server
Summary: Standalone server for Hedgewars, a turn-based strategy game
Group: Amusements/Games/Strategy/Turn Based
@@ -108,15 +116,19 @@
rotational on the same computer.
This package contains a standalone local hedgewars server.
-%endif
+
%prep
%setup -q -n %{name}-src-%{version}
%build
-%cmake -DNOVIDEOREC=%{_no_ffmpeg} \
- -DNOSERVER=%{_no_server} \
- -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
+# CMAKE_POLICY_DEFAULT_CMP0083=NEW - apply POSITION_INDEPENDENT_CODE also to
"-pie", since CMake 3.14
+%cmake \
+ -DPOSITION_INDEPENDENT_CODE=ON \
+ -DCMAKE_POLICY_DEFAULT_CMP0083=NEW \
+ -DNOVIDEOREC=%{?_with_videorec:0}%{!?_with_videorec:1} \
+ -DNOSERVER=%{?_with_server:0}%{!?_with_server:1} \
+ -DBUILD_ENGINE_C=%{?_with_engine_c:1}%{!?_with_engine_c:0}
make %{?_smp_mflags}
@@ -130,7 +142,12 @@
mv %{buildroot}%{_datadir}/%{name}/Data/misc/%{name}.desktop
%{buildroot}%{_datadir}/applications/%{name}.desktop
mkdir -p %{buildroot}%{_datadir}/mime/packages
mv %{buildroot}%{_datadir}/%{name}/Data/misc/hedgewars-mimeinfo.xml
%{buildroot}%{_datadir}/mime/packages/%{name}.xml
-chmod -x %{buildroot}%{_datadir}/mime/packages/%{name}.xml
%{buildroot}%{_datadir}/appdata/hedgewars.appdata.xml
+# appdata name is deprecated in favor of metainfo
+mv %{buildroot}%{_datadir}/{appdata,metainfo}
+chmod -x %{buildroot}%{_datadir}/mime/packages/%{name}.xml
%{buildroot}%{_datadir}/metainfo/hedgewars.appdata.xml
+
+# Delete obsolete xpm icon, .desktop uses the ones from hicolor
+rm %{buildroot}%{_datadir}/pixmaps/hedgewars.xpm
## TODO: $LIB_INSTALL_DIR seems to be ignored.
#%%ifarch x86_64
@@ -154,15 +171,14 @@
%mime_database_postun
%files
-%defattr(-,root,root)
-%doc README ChangeLog.txt Fonts_LICENSE.txt
+%doc README.md ChangeLog.txt
+%license COPYING Fonts_LICENSE.txt
%doc %{_mandir}/man6/*
%{_datadir}/applications/*.desktop
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%dir %{_datadir}/appdata/
-%{_datadir}/appdata/hedgewars.appdata.xml
-%{_datadir}/pixmaps/hedgewars.xpm
+%dir %{_datadir}/metainfo/
+%{_datadir}/metainfo/hedgewars.appdata.xml
%{_bindir}/%{name}
%{_bindir}/hwengine
# ugly, but necessary:
@@ -170,12 +186,10 @@
%{_libdir}/libphyslayer.so
%files data
-%defattr(-,root,root)
%{_datadir}/%{name}/
-%if %{_no_server} == 0
+%if %{with server}
%files server
-%defattr(-,root,root)
%{_bindir}/%{name}-server
%endif
