pool/slade
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 616318 from games:tools

Browse Source 
- Fix build failure... slade wants zip, not p7zip.
- Wrap %desktop_* into a 42.x/13.x guard.

OBS-URL: https://build.opensuse.org/request/show/616318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slade?expand=0&rev=6
This commit is contained in:
Yuchen Lin 2018-06-19 09:56:24 +00:00 committed by Git OBS Bridge
commit b0583ffd76
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slade.changes
View File

@ -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 Wed Apr 18 14:26:53 UTC 2018 - guillaume.gardet@opensuse.org

4
slade.spec
View File

@ -34,9 +34,9 @@ BuildRequires: ImageMagick
BuildRequires: cmake BuildRequires: cmake
BuildRequires: freeimage-devel BuildRequires: freeimage-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: p7zip
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel BuildRequires: wxWidgets-3_0-devel
BuildRequires: zip
BuildRequires: pkgconfig(fluidsynth) BuildRequires: pkgconfig(fluidsynth)
BuildRequires: pkgconfig(ftgl) BuildRequires: pkgconfig(ftgl)
BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gl)
@ -87,11 +87,13 @@ popd
install -Dm644 "%_sourcedir/slade.desktop" "$b/%_datadir/applications/%name.desktop" install -Dm644 "%_sourcedir/slade.desktop" "$b/%_datadir/applications/%name.desktop"
%if 0%{?suse_version} <= 1320
%post %post
%desktop_database_post %desktop_database_post
%postun %postun
%desktop_database_postun %desktop_database_postun
%endif
%files %files
%defattr(-,root,root) %defattr(-,root,root)