Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hedgewars for openSUSE:Factory checked in at 2022-09-25 15:35:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hedgewars (Old) and /work/SRC/openSUSE:Factory/.hedgewars.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hedgewars" Sun Sep 25 15:35:11 2022 rev:12 rq:1005683 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/hedgewars/hedgewars.changes 2020-09-22 21:12:58.568023625 +0200 +++ /work/SRC/openSUSE:Factory/.hedgewars.new.2275/hedgewars.changes 2022-09-25 15:35:33.927660850 +0200 @@ -1,0 +2,11 @@ +Wed Sep 21 22:05:40 UTC 2022 - Antoine Belvire <antoine.belv...@opensuse.org> + +- Update to 1.0.2: No changelog provided. +- Remove patches fixed upstream: + * 0001-Fix-build-with-Qt-5.15.patch + * hedgewars-fpc320_fix.patch +- Add hedgewars-1.0.2-rpath.patch: Fix rpmlint error + 'binary-or-shlib-defines-rpath'. +- Refresh spec file. + +------------------------------------------------------------------- Old: ---- 0001-Fix-build-with-Qt-5.15.patch hedgewars-fpc320_fix.patch hedgewars-src-1.0.0.tar.bz2 New: ---- hedgewars-1.0.2-rpath.patch hedgewars-src-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hedgewars.spec ++++++ --- /var/tmp/diff_new_pack.EMog7u/_old 2022-09-25 15:35:36.123666140 +0200 +++ /var/tmp/diff_new_pack.EMog7u/_new 2022-09-25 15:35:36.127666149 +0200 @@ -1,7 +1,7 @@ # # spec file for package hedgewars # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,18 +27,17 @@ %endif Name: hedgewars -Version: 1.0.0 +Version: 1.0.2 Release: 0 Summary: Turn-based artillery game, featuring fighting hedgehogs License: GPL-2.0-only Group: Amusements/Games/Strategy/Turn Based -URL: http://www.hedgewars.org/ +URL: https://www.hedgewars.org/ Source: http://hedgewars.org/download/releases/hedgewars-src-%{version}.tar.bz2 Source99: %{name}-rpmlintrc Patch0: hedgewars-disable_fpc_workaround.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-Fix-build-with-Qt-5.15.patch -Patch2: hedgewars-fpc320_fix.patch +# PATCH-FIX-OPENSUSE hedgewars-1.0.2-rpath.patch -- Fix RPATH with non-system library path +Patch1: hedgewars-1.0.2-rpath.patch BuildRequires: SDL2-devel BuildRequires: SDL2_image-devel BuildRequires: SDL2_mixer-devel @@ -65,8 +64,6 @@ # Required for QAbstractFileEngine*, which is no longer public since Qt5.12 BuildRequires: libQt5Core-private-headers-devel BuildRequires: libqt5-linguist-devel -BuildRequires: shared-mime-info -BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(lua5.1) Requires: %{name}-data = %{version} @@ -122,12 +119,10 @@ This package contains a standalone local hedgewars server. - %prep %setup -q -n %{name}-src-%{version} %patch0 -p0 %patch1 -p1 -%patch2 -p1 %build # CMAKE_POLICY_DEFAULT_CMP0083=NEW - apply POSITION_INDEPENDENT_CODE also to "-pie", since CMake 3.14 @@ -137,8 +132,7 @@ -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} +%cmake_build %install %cmake_install @@ -157,26 +151,10 @@ # 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 -#mkdir -p %%{buildroot}%%{_libdir} -#mv %%{buildroot}/usr/lib/* %%{buildroot}%%{_libdir}/ -#%%endif - -%suse_update_desktop_file %{name} %fdupes %{buildroot}%{_datadir} -%post -/sbin/ldconfig -%desktop_database_post -%icon_theme_cache_post -%mime_database_post - -%postun -/sbin/ldconfig -%desktop_database_postun -%icon_theme_cache_postun -%mime_database_postun +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %doc README.md ChangeLog.txt ++++++ hedgewars-1.0.2-rpath.patch ++++++ Remove RPATH with non-system library path from binaries This is essentially https://hg.hedgewars.org/hedgewars/rev/084af6d2685f rebased on 1.0.2. Here is the original patch description: ``` # HG changeset patch # User Wuzzy <wuz...@mail.ru> # Date 1542668975 -3600 # Node ID 084af6d2685f989b3375603f740f47f8febae130 # Parent bdc7ba72bbade0e11c8d65bfc52822685b582e53 Thas else() in paths.cmake did not make sense. Hopefully this fixes Fedora build issues ``` This original patch was reverted later by 3342358bc2c3 with no detail given. Maybe it was breaking build relying on $ORIGIN being in RPATH. Anyway it just looks fine for standard RPM building and it fixes rpmlint errors (E: binary-or-shlib-defines-rpath) so let's apply it. --- hedgewars-src-1.0.2/cmake_modules/paths.cmake 2022-09-21 22:42:51.555822630 +0200 +++ hedgewars-src-1.0.2/cmake_modules/paths.cmake 2022-09-21 22:43:05.759823219 +0200 @@ -61,7 +61,7 @@ if(APPLE) #install_name_tool for libraries set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR TRUE) set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Frameworks") -else(APPLE AND NOT (${CMAKE_INSTALL_PREFIX} MATCHES "/usr")) +elseif(NOT (${CMAKE_INSTALL_PREFIX} MATCHES "/usr")) #paths where to find libraries (final slash not optional): # - the first is relative to the executable # - the second is the same directory of the executable (so it runs in bin/) ++++++ hedgewars-src-1.0.0.tar.bz2 -> hedgewars-src-1.0.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/hedgewars/hedgewars-src-1.0.0.tar.bz2 /work/SRC/openSUSE:Factory/.hedgewars.new.2275/hedgewars-src-1.0.2.tar.bz2 differ: char 11, line 1
