From 12df2d1011620170ac26a8c9a4277cf9e0f6aafb8844fe12cef2cb64577f6f4f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 12 Jun 2018 12:50:02 +0000 Subject: [PATCH] - Fix build failure... slade wants zip, not p7zip. - Wrap %desktop_* into a 42.x/13.x guard. OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=18 --- slade.changes | 6 ++++++ slade.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/slade.changes b/slade.changes index 30654a0..d1539af 100644 --- a/slade.changes +++ b/slade.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 12 12:46:57 UTC 2018 - jengelh@inai.de + +- Fix build failure... slade wants zip, not p7zip. +- Wrap %desktop_* into a 42.x/13.x guard. + ------------------------------------------------------------------- Wed Apr 18 14:26:53 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/slade.spec b/slade.spec index b422aa7..12d11a5 100644 --- a/slade.spec +++ b/slade.spec @@ -34,9 +34,9 @@ BuildRequires: ImageMagick BuildRequires: cmake BuildRequires: freeimage-devel BuildRequires: gcc-c++ -BuildRequires: p7zip BuildRequires: update-desktop-files BuildRequires: wxWidgets-3_0-devel +BuildRequires: zip BuildRequires: pkgconfig(fluidsynth) BuildRequires: pkgconfig(ftgl) BuildRequires: pkgconfig(gl) @@ -87,11 +87,13 @@ popd install -Dm644 "%_sourcedir/slade.desktop" "$b/%_datadir/applications/%name.desktop" +%if 0%{?suse_version} <= 1320 %post %desktop_database_post %postun %desktop_database_postun +%endif %files %defattr(-,root,root)