Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package warzone2100 for openSUSE:Factory
checked in at 2021-04-15 16:57:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/warzone2100 (Old)
and /work/SRC/openSUSE:Factory/.warzone2100.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "warzone2100"
Thu Apr 15 16:57:12 2021 rev:6 rq:885061 version:4.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/warzone2100/warzone2100.changes 2020-09-25
16:30:23.327829417 +0200
+++ /work/SRC/openSUSE:Factory/.warzone2100.new.12324/warzone2100.changes
2021-04-15 16:57:34.962690002 +0200
@@ -1,0 +2,33 @@
+Mon Apr 12 02:51:32 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Dropped unneeded QT5 dependencies
+- Build Vulkan with conditional macros
+- Use cmake build macro
+ * Disable LTO, does not compile at the moment
+
+-------------------------------------------------------------------
+Sun Apr 11 14:31:20 UTC 2021 - Imo Hester <vor...@z-ray.de>
+
+- Disbaled Vulkan for Leap releases via cmake flags
+
+-------------------------------------------------------------------
+Sun Apr 11 14:04:03 UTC 2021 - Imo Hester <vor...@z-ray.de>
+
+- Disabled vulkan for Leap 15.2 and below due to older vulkan packages
+- Fixed pkg-config resolve issues for Leap 15.2 and below
+
+-------------------------------------------------------------------
+Sun Apr 11 13:41:51 UTC 2021 - Imo Hester <vor...@z-ray.de>
+
+- Updated to 4.0.0
+- Added Vulkan dependencies for the new vulkan backend
+- Changed GPL-2.0 to GPL-3.0 because CMakeList.txt sais:
+if(WZ_ENABLE_BACKEND_VULKAN)
+ # If Vulkan is enabled, use the GPL3 license for distribution
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkg/licenses/COPYING.gpl3"
"${WZ_DIST_LICENSE}" COPYONLY)
+else()
+ # GPLv2
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/COPYING"
"${WZ_DIST_LICENSE}" COPYONLY)
+endif()
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ warzone2100.spec ++++++
--- /var/tmp/diff_new_pack.Puvnim/_old 2021-04-15 16:57:53.694719641 +0200
+++ /var/tmp/diff_new_pack.Puvnim/_new 2021-04-15 16:57:53.694719641 +0200
@@ -1,7 +1,7 @@
#
# spec file for package warzone2100
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,22 +15,26 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
+# Linking is broken with LTO at the moment
+%define _lto_cflags %{nil}
+# NOTE Vulkan is disabled for Leap 15 due to older VK Headers
+%if 0%{?suse_version} > 1500
+%bcond_without vulkan
+%else
+%bcond_with vulkan
+%endif
Name: warzone2100
-Version: 3.4.1
+Version: 4.0.0
Release: 0
Summary: Innovative 3D real-time strategy
-License: GPL-2.0-or-later AND CC-BY-SA-3.0 AND CC0-1.0 AND BSD-3-Clause
AND LGPL-2.1-only
+License: BSD-3-Clause AND CC-BY-SA-3.0 AND GPL-3.0-or-later AND CC0-1.0
AND LGPL-2.1-only
Group: Amusements/Games/Strategy/Real Time
URL: http://wz2100.net/
Source:
https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz
Source99: %{name}.changes
BuildRequires: asciidoc
-BuildRequires: asciidoc
-BuildRequires: automake
-BuildRequires: bison
BuildRequires: cmake >= 3.5
-BuildRequires: flex
+BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libjpeg-devel
@@ -40,15 +44,7 @@
BuildRequires: pkg-config
BuildRequires: unzip
BuildRequires: update-desktop-files
-BuildRequires: xz
BuildRequires: zip
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Gui)
-BuildRequires: pkgconfig(Qt5OpenGL)
-BuildRequires: pkgconfig(Qt5Script)
-BuildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: pkgconfig(fribidi)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glew) >= 1.5.2
BuildRequires: pkgconfig(harfbuzz)
@@ -57,20 +53,19 @@
BuildRequires: pkgconfig(libsodium)
BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(openal)
-BuildRequires: pkgconfig(popt)
-BuildRequires: pkgconfig(quesoglc)
BuildRequires: pkgconfig(sdl2)
-BuildRequires: pkgconfig(theora)
+BuildRequires: pkgconfig(sqlite3) >= 3.14
BuildRequires: pkgconfig(theora)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vorbisfile)
-BuildRequires: pkgconfig(xrandr)
+BuildRequires: rubygem(asciidoctor)
+%if %{with vulkan}
+BuildRequires: shaderc
+BuildRequires: vulkan-headers >= 1.2.148
+BuildRequires: pkgconfig(vulkan)
+%endif
Requires: %{name}-data = %{version}
Recommends: %{name}-movies
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} <= 1220
-BuildRequires: libopenal1
-%endif
%description
You command the forces of "The Project" in a battle to rebuild
@@ -122,12 +117,12 @@
find . -name '*.cpp' | xargs sed -i
"s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g"
%build
-mkdir build && cd build
-# NOTE that cmake macro breaks linking.
-cmake .. \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-make %{?_smp_mflags}
+%cmake .. \
+%if %{without vulkan}
+ -DWZ_ENABLE_BACKEND_VULKAN=Off \
+%endif
+ -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake_build
%install
%cmake_install
@@ -140,28 +135,19 @@
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
mv %{buildroot}%{_datadir}/icons/warzone2100.png
%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/warzone2100.png
-%post
-%desktop_database_post
-
-%postun
-%desktop_database_postun
+%fdupes %{buildroot}%{_datadir}
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING.NONGPL COPYING.README
+%license COPYING COPYING.NONGPL COPYING.README
+%doc AUTHORS ChangeLog
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/appdata/warzone2100.appdata.xml
%{_datadir}/icons/hicolor/*/apps/warzone2100.png
%{_datadir}/doc/%{name}
%{_mandir}/man6/%{name}.6.*
-%if 0%{?suse_version} == 1110
-%dir %{_datadir}/locale/la
-%dir %{_datadir}/locale/la/LC_MESSAGES
-%endif
%files data
-%defattr(-,root,root,-)
%{_datadir}/warzone2100/
%changelog
++++++ warzone2100_src.tar.xz ++++++
/work/SRC/openSUSE:Factory/warzone2100/warzone2100_src.tar.xz
/work/SRC/openSUSE:Factory/.warzone2100.new.12324/warzone2100_src.tar.xz
differ: char 25, line 1
