From bf9a6912d8864a51c131395282beb341df9ae2b9 Mon Sep 17 00:00:00 2001
From: helloworld1 <helloworld1@fedoraproject.org>
Date: Tue, 11 May 2010 12:05:56 +0000
Subject: [PATCH] *** empty log message ***

---
 .cvsignore                   |  2 +-
 goldendict-desktopicon.patch | 12 ++++++++---
 goldendict.spec              | 40 ++++++++++++++++--------------------
 sources                      |  2 +-
 4 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6dfc2a5..492e91c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-goldendict-83115ad.tar.gz
+goldendict-ceab951.tar.gz
diff --git a/goldendict-desktopicon.patch b/goldendict-desktopicon.patch
index 3d3571d..ca14d00 100644
--- a/goldendict-desktopicon.patch
+++ b/goldendict-desktopicon.patch
@@ -1,6 +1,12 @@
---- src/redist/goldendict.desktop.orig	2010-04-11 12:57:05.081844813 -0400
-+++ src/redist/goldendict.desktop	2010-04-11 12:58:03.998845830 -0400
-@@ -6,5 +6,5 @@
+--- goldendict-ceab951/src/redist/goldendict.desktop.orig	2010-05-10 23:12:52.684289402 -0400
++++ goldendict-ceab951/src/redist/goldendict.desktop	2010-05-10 23:14:00.876259920 -0400
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Type=Application
+ Terminal=false
+-Categories=Office;Dictionary;Education;Qt;Applications
++Categories=Utility
+ Name=GoldenDict
  GenericName=Multiformat Dictionary
  Comment=GoldenDict
  Encoding=UTF-8
diff --git a/goldendict.spec b/goldendict.spec
index 0fae79a..b9d8f9b 100644
--- a/goldendict.spec
+++ b/goldendict.spec
@@ -1,14 +1,14 @@
-%define githash 83115ad
-%define gitdate 20100307
+%define githash ceab951
+%define gitdate 20100510
 
 Name:		goldendict
 Version:	0.9.0
-Release:	9.%{gitdate}git%{githash}%{?dist}
+Release:	10.%{gitdate}git%{githash}%{?dist}
 Summary:	A feature-rich dictionary lookup program
 Group:		Applications/System
 License:	GPLv3+
-URL:		http://goldendict.berlios.de/  
-#Source0:	http://prdownload.berlios.de/goldendict/goldendict-0.9.0-src-x11.tar.bz2 
+URL:		http://goldendict.berlios.de/
+#Source0:	http://prdownload.berlios.de/goldendict/goldendict-0.9.0-src-x11.tar.bz2
 # The source is generated from the git snapshot using the following command
 # git clone git://git.berlios.de/goldendict
 # git archive master --prefix=goldendict-`git log --pretty=format:"%h"| head -n1`/ |gzip > goldendict-`git log --pretty=format:"%h"|head -n1`.tar.gz
@@ -25,11 +25,11 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	phonon-devel
 
-Requires:	kde-filesystem	
+Requires:	kde-filesystem
 
 
 %description
-Goldendict is a feature-rich dictionary lookup program. 
+Goldendict is a feature-rich dictionary lookup program.
 The latest release has the following features:
 Use of WebKit for an accurate articles' representation;
 Support of multiple dictionary file formats;
@@ -38,7 +38,7 @@ Scan popup functionality.
 
 %prep
 %setup -q -n goldendict-%{githash}
-%patch0 -p0
+%patch0 -p1
 
 
 %build
@@ -50,20 +50,14 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 cd src
-make install INSTALL_ROOT=%{buildroot}
+make install INSTALL_ROOT=%{buildroot} INSTALL="install -p"
 rm -rf %{buildroot}/%{_datadir}/app-install
-desktop-file-install					\
-	--add-category="Utility"			\
-	--remove-category="Office"			\
-	--remove-category="Dictionary"			\
-	--remove-category="Education"			\
-	--remove-category="Qt"				\
-	--remove-category="Applications"		\
-	--delete-original				\
-	--dir=%{buildroot}/%{_datadir}/applications	\
-%{buildroot}/%{_datadir}/applications/goldendict.desktop
+desktop-file-install \
+    --delete-original \
+    --dir=%{buildroot}/%{_datadir}/applications	\
+    %{buildroot}/%{_datadir}/applications/goldendict.desktop
 install -d %{buildroot}/%{_datadir}/apps/goldendict/locale
-install -m 644 locale/*.qm %{buildroot}/%{_datadir}/apps/goldendict/locale
+install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/apps/goldendict/locale
 
 
 %clean
@@ -83,13 +77,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed May 15 2010 Howard Ning <mrlhwliberty@gmail.com> - 0.9.0-10
+- Update to latest upstream.
+- Clean up the spec file more.
+
 * Wed Apr 14 2010 Howard Ning <mrlhwliberty@gmail.com> - 0.9.0-9
 - Add kde-filesystem requirement.
 
 * Fri Apr 11 2010 Howard Ning <mrlhwliberty@gmail.com> - 0.9.0-8
 - Patch the desktop file to conform the guideline.
 - Clean up the spec file more.
-
 * Fri Apr 09 2010 Howard Ning <mrlhwliberty@gmail.com> - 0.9.0-7
 - Clean up the spec file.
 - Add ownership of the missing directories.
@@ -113,4 +110,3 @@ rm -rf %{buildroot}
 
 * Wed Dec 9 2009 Howard Ning <mrlhwliberty@gmail.com> - 0.9.0-1
 - Initial Release
-
diff --git a/sources b/sources
index 44b172b..ff1783a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-737016234a98c9c45911329cf258cda5  goldendict-83115ad.tar.gz
+f1285668ec58c3fe36eefc1d62f0123c  goldendict-ceab951.tar.gz