From 775eb4224cf9dbb3f289a49f3256ca9cdc08c5b3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 20 Oct 2011 10:41:22 -0500 Subject: [PATCH] 0.7.1 20111020 snapshot (with better fix for hack in 0.7.0-5) --- .gitignore | 1 + apper-0.7.0-crashfix.patch | 27 --------------------------- apper-0.7.0-dt_categories.patch | 19 ------------------- apper-0.7.1-dt_fixes.patch | 22 ++++++++++++++++++++++ apper.spec | 24 ++++++++++++++++-------- sources | 2 +- 6 files changed, 40 insertions(+), 55 deletions(-) delete mode 100644 apper-0.7.0-crashfix.patch delete mode 100644 apper-0.7.0-dt_categories.patch create mode 100644 apper-0.7.1-dt_fixes.patch diff --git a/.gitignore b/.gitignore index 2d0e0bc..34fecc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /apper-0.7.0.tar.bz2 +/apper-0.7.1-20111020.tar.bz2 diff --git a/apper-0.7.0-crashfix.patch b/apper-0.7.0-crashfix.patch deleted file mode 100644 index 98d2b96..0000000 --- a/apper-0.7.0-crashfix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up apper-0.7.0/libapper/Requirements.cpp.crashfix apper-0.7.0/libapper/Requirements.cpp ---- apper-0.7.0/libapper/Requirements.cpp.crashfix 2011-10-10 10:34:18.000000000 -0500 -+++ apper-0.7.0/libapper/Requirements.cpp 2011-10-19 13:32:12.191857593 -0500 -@@ -149,7 +149,9 @@ Requirements::~Requirements() - KConfigGroup requirementsDialog(&config, "requirementsDialog"); - saveDialogSize(requirementsDialog); - -- if (!m_hideAutoConfirm) { -+ // isChecked is crashing mysteriously (use after free somewhere?), -+ // maybe hack all this out for now -- rex -+ if (0 && !m_hideAutoConfirm) { - requirementsDialog.writeEntry("autoConfirm", ui->confirmCB->isChecked()); - } - config.sync(); -diff -up apper-0.7.0/libapper/Requirements.ui.crashfix apper-0.7.0/libapper/Requirements.ui ---- apper-0.7.0/libapper/Requirements.ui.crashfix 2011-10-10 10:34:18.000000000 -0500 -+++ apper-0.7.0/libapper/Requirements.ui 2011-10-19 13:32:02.285981435 -0500 -@@ -83,6 +83,9 @@ - - - -+ -+ false -+ - - Do not confirm when installing or updating additional packages - diff --git a/apper-0.7.0-dt_categories.patch b/apper-0.7.0-dt_categories.patch deleted file mode 100644 index 7d6e06c..0000000 --- a/apper-0.7.0-dt_categories.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up apper-0.7.0/Desktop/apper.desktop.dt_categories apper-0.7.0/Desktop/apper.desktop ---- apper-0.7.0/Desktop/apper.desktop.dt_categories 2011-10-10 10:34:18.000000000 -0500 -+++ apper-0.7.0/Desktop/apper.desktop 2011-10-17 13:10:43.125468279 -0500 -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Application - Icon=applications-other --Exec=apper %U -+Exec=apper %F - X-DBUS-StartupType=Unique - X-DBUS-ServiceName=org.kde.apper - -@@ -88,5 +88,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-0.7.1-dt_fixes.patch b/apper-0.7.1-dt_fixes.patch new file mode 100644 index 0000000..5070243 --- /dev/null +++ b/apper-0.7.1-dt_fixes.patch @@ -0,0 +1,22 @@ +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 c1e21c1..f0af14e 100644 --- a/apper.spec +++ b/apper.spec @@ -3,13 +3,20 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 +%define snap 20111020 + Name: apper -Version: 0.7.0 -Release: 5%{?dist} +Version: 0.7.1 +Release: 0.1.%{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 +%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(?), @@ -17,10 +24,8 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Patch1: apper-0.7.0-systray_actions.patch ## upstreamable patches -# fix Exec, Categories -Patch50: apper-0.7.0-dt_categories.patch -# hack around crash in standalone installs -Patch51: apper-0.7.0-crashfix.patch +# fix Categories, Exec, StartupNotify +Patch50: apper-0.7.1-dt_fixes.patch ## upstream patches @@ -50,8 +55,7 @@ KDE interface for PackageKit. %setup -q %patch1 -p1 -b .systray_actions -%patch50 -p1 -b .dt_categories -%patch51 -p1 -b .crashfix +%patch50 -p1 -b .dt_fixes %build @@ -104,9 +108,13 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt # TODO: fix this to match comps' categories/groups %{_datadir}/app-install/categories.xml %endif +%{_mandir}/man1/apper.1* %changelog +* 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) + * Wed Oct 19 2011 Rex Dieter 0.7.0-5 - hack around crash on installing standalone rpms diff --git a/sources b/sources index 945c53b..e152bc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -712b52dd9bd9eda7368d0820404d50f8 apper-0.7.0.tar.bz2 +7f3a82cb59d77f44943bf33c2ac9480f apper-0.7.1-20111020.tar.bz2