[apper/f16] 0.7.1 20111020 snapshot (with better fix for hack in 0.7.0-5)

Rex Dieter rdieter at fedoraproject.org
Thu Oct 20 15:34:00 UTC 2011


commit 775eb4224cf9dbb3f289a49f3256ca9cdc08c5b3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 20 10:41:22 2011 -0500

    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(-)
---
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.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 <rdieter at fedoraproject.org> 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 <rdieter at fedoraproject.org> 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


More information about the scm-commits mailing list