From 41d40b20c81212617f4896f5d8538ac8f6f428ae Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 31 2015 18:08:29 +0000 Subject: omit plasma4-based updater applet (f22+) --- diff --git a/apper.spec b/apper.spec index 3cf8f91..bffb4d9 100644 --- a/apper.spec +++ b/apper.spec @@ -4,9 +4,13 @@ ## https://bugzilla.redhat.com/1180819#c20 #define appstream 1 +%if 0%{?fedora} > 21 +%define plasma5 1 +%endif + Name: apper Version: 0.9.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -67,6 +71,13 @@ KDE interface for PackageKit. %prep %autosetup -p1 +%if 0%{?plasma5} +sed -e 's|^add_subdirectory(declarative-plugins)|#add_subdirectory(declarative-plugins)|g' \ + -e 's|^add_subdirectory(plasmoid)|#add_subdirectory(plasmoid)|g' \ + -i CMakeLists.txt +rm -fv po/*/plasma_applet_org.packagekit.updater.po +%endif + %build mkdir -p %{_target_platform} @@ -95,11 +106,13 @@ mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ chrpath --list %{buildroot}%{_kde4_bindir}/apper chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper +%if ! 0%{?plasma5} # show apper updater systray applet by default install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js mkdir -p %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/ ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js \ %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js +%endif %check @@ -129,17 +142,22 @@ fi %{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service %{_kde4_libexecdir}/apper-pk-session %{_mandir}/man1/apper.1* +%if ! 0%{?plasma5} # plasma-applet-updater %{_kde4_appsdir}/plasma/plasmoids/org.packagekit.updater/ %{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js %{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js %{_kde4_datadir}/kde4/services/plasma-applet-org.packagekit.updater.desktop %{_kde4_libdir}/kde4/imports/org/kde/apper/ +%endif # appdata %{_datadir}/appdata/apper.appdata.xml %changelog +* Tue Mar 31 2015 Rex Dieter 0.9.1-7 +- omit plasma4-based updater applet (f22+) + * Tue Jan 13 2015 Rex Dieter 0.9.1-6 - disable appstream support (#1180819)