diff --git a/apper-0.7.0-systray_actions.patch b/apper-0.7.0-systray_actions.patch deleted file mode 100644 index 75f2872..0000000 --- a/apper-0.7.0-systray_actions.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up apper-0.7.0/Sentinel/UpdateIcon.cpp.systray_actions apper-0.7.0/Sentinel/UpdateIcon.cpp ---- apper-0.7.0/Sentinel/UpdateIcon.cpp.systray_actions 2011-10-10 10:34:18.000000000 -0500 -+++ apper-0.7.0/Sentinel/UpdateIcon.cpp 2011-10-19 08:45:20.680193295 -0500 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include - -@@ -59,7 +60,11 @@ UpdateIcon::~UpdateIcon() - - void UpdateIcon::showSettings() - { -- KToolInvocation::startServiceByDesktopName("Apper", QStringList() << "--settings"); -+// try QProcess:execute first, KToolInvocation::startServiceByDesktopName seems to not work -+// giving .xsession-errors like: kioexec: Unknown option 'settings'. -+ if ( ! QProcess::execute("apper", QStringList() << "--settings")) { -+ KToolInvocation::startServiceByDesktopName("Apper", QStringList() << "--settings"); -+ } - } - - void UpdateIcon::refresh(bool update) -@@ -294,7 +299,11 @@ void UpdateIcon::autoUpdatesFinished(Pac - - void UpdateIcon::showUpdates() - { -- KToolInvocation::startServiceByDesktopName("Apper", QStringList() << "--updates"); -+// try QProcess:execute first, KToolInvocation::startServiceByDesktopName seems to not work -+// giving .xsession-errors like: kioexec: Unknown option 'updates'. -+ if ( ! QProcess::execute("apper", QStringList() << "--updates")) { -+ KToolInvocation::startServiceByDesktopName("Apper", QStringList() << "--updates"); -+ } - } - - void UpdateIcon::removeStatusNotifierItem() diff --git a/apper-0.7.1-dt_fixes.patch b/apper-0.7.1-dt_fixes.patch deleted file mode 100644 index 5070243..0000000 --- a/apper-0.7.1-dt_fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up apper-0.7.1/Desktop/apper.desktop.dt_categories apper-0.7.1/Desktop/apper.desktop ---- apper-0.7.1/Desktop/apper.desktop.dt_categories 2011-10-20 09:44:40.000000000 -0500 -+++ apper-0.7.1/Desktop/apper.desktop 2011-10-20 10:37:54.079798435 -0500 -@@ -1,9 +1,8 @@ - [Desktop Entry] - Type=Application - Icon=applications-other --Exec=apper %U --X-DBUS-StartupType=Unique --X-DBUS-ServiceName=org.kde.apper -+Exec=apper -+StartupNotify=false - - Name=Apper - Name[bg]=Apper -@@ -88,5 +87,5 @@ Comment[x-test]=xxApplication to get and - - MimeType=application/x-deb;application/x-rpm;application/x-redhat-package-manager;application/x-servicepack; - Terminal=false --Categories=Qt;KDE;System;PackageManager; -+Categories=Qt;KDE;System;Settings;PackageManager; - InitialPreference=10 diff --git a/apper.spec b/apper.spec index f0af14e..0b2cf84 100644 --- a/apper.spec +++ b/apper.spec @@ -7,29 +7,18 @@ Name: apper Version: 0.7.1 -Release: 0.1.%{snap}%{?dist} +Release: 0.2.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap} # use releaseme/apper.rc --version 0.7.1 -Source0: apper-%{version}-%{snap}.tar.bz2 +Source0: apper-%{version}-%{snap}-2.tar.bz2 %else Source0: http://dl.dropbox.com/u/37314029/apper-%{version}.tar.bz2 %endif URL: http://kde-apps.org/content/show.php/Apper?content=84745 -# KToolInvocation::startServiceByName seems fail(?), -# use QProcess::execute like kpk did -Patch1: apper-0.7.0-systray_actions.patch - -## upstreamable patches -# fix Categories, Exec, StartupNotify -Patch50: apper-0.7.1-dt_fixes.patch - -## upstream patches - - Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} # required because gnome-packagekit provides exactly the same interface @@ -54,9 +43,6 @@ KDE interface for PackageKit. %prep %setup -q -%patch1 -p1 -b .systray_actions -%patch50 -p1 -b .dt_fixes - %build mkdir -p %{_target_platform} @@ -96,6 +82,7 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %{_kde4_libdir}/kde4/kded_apperd.so %{_kde4_libexecdir}/apper-sentinel %{_kde4_datadir}/applications/kde4/apper.desktop +%{_kde4_datadir}/applications/kde4/apper_*.desktop %{_kde4_datadir}/kde4/services/kcm_apper.desktop %{_kde4_datadir}/kde4/services/kded/apperd.desktop %{_kde4_appsdir}/apper/ @@ -112,6 +99,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Thu Oct 20 2011 Rex Dieter 0.7.1-0.2.20111020 +- fresher snapshot, more fixes upstream. mmm, mmm, good. + * Thu Oct 20 2011 Rex Dieter 0.7.1-0.1.20111020 - 0.7.1 20111020 snapshot (with better fix for hack in 0.7.0-5)