From 1158450e469fb2bbc303a587b37fdcd96f860bbecab2e4b8d912703685ec21a9 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 20 Feb 2020 17:24:49 +0000 Subject: [PATCH] Accepting request 777679 from home:KAMiKAZOW:Test - Clean up strawberry.spec file by removing conditions for EOL Leap 42.x. OBS-URL: https://build.opensuse.org/request/show/777679 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/strawberry?expand=0&rev=60 --- strawberry.changes | 5 +++++ strawberry.spec | 26 -------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/strawberry.changes b/strawberry.changes index 57eddf9..a321380 100644 --- a/strawberry.changes +++ b/strawberry.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 20 12:40:19 UTC 2020 - Markus S + +- Clean up strawberry.spec file by removing conditions for EOL Leap 42.x. + ------------------------------------------------------------------- Sun Jan 5 22:40:58 UTC 2020 - Jonas Kvinge diff --git a/strawberry.spec b/strawberry.spec index 928f410..85e50a1 100644 --- a/strawberry.spec +++ b/strawberry.spec @@ -65,19 +65,11 @@ BuildRequires: pkgconfig(libmtp) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudf) -%if 0%{?suse_version} >= 1500 BuildRequires: pkgconfig(libvlc) -%endif BuildRequires: pkgconfig(libxine) BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(sqlite3) >= 3.9 BuildRequires: pkgconfig(taglib) >= 1.11.1 -%if 0%{?suse_version} < 1500 -Requires(post): update-desktop-files -Requires(post): gtk3-tools -Requires(postun): update-desktop-files -Requires(postun): gtk3-tools -%endif Requires: libQt5Sql5-sqlite @@ -116,27 +108,11 @@ make %{?_smp_mflags} %install %cmake_install -%if 0%{?suse_version} < 1500 -rm -f %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml -%endif - %suse_update_desktop_file org.strawberrymusicplayer.strawberry Qt AudioVideo Audio Player -%if 0%{?suse_version} < 1500 -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%endif - %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicplayer.strawberry.desktop -%if 0%{?suse_version} >= 1500 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml -%endif %files %doc README.md Changelog @@ -144,9 +120,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.straw %{_bindir}/strawberry* %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/strawberry.* -%if 0%{?suse_version} >= 1500 %{_datadir}/metainfo/*.appdata.xml -%endif %{_mandir}/man1/%{name}.1%{?ext_man} %{_mandir}/man1/%{name}-tagreader.1%{?ext_man}