rpms/goldendict/F-13 goldendict.spec, 1.3, 1.4 goldendict-desktopicon.patch, 1.2, NONE

[helloworld1]

Author: helloworld1

Update of /cvs/pkgs/rpms/goldendict/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22891

Modified Files:
	goldendict.spec 
Removed Files:
	goldendict-desktopicon.patch 
Log Message:


fixed?



Index: goldendict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goldendict/F-13/goldendict.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- goldendict.spec	11 May 2010 14:13:39 -0000	1.3
+++ goldendict.spec	11 May 2010 18:25:12 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		goldendict
 Version:	0.9.0
-Release:	10.%{gitdate}git%{githash}%{?dist}
+Release:	11.%{gitdate}git%{githash}%{?dist}
 Summary:	A feature-rich dictionary lookup program
 Group:		Applications/System
 License:	GPLv3+
@@ -15,18 +15,14 @@ URL:		http://goldendict.berlios.de/
 Source0:	%{name}-%{githash}.tar.gz
 
 # Modify the Icon section in desktop file to comform package guideline.
-Patch0:		goldendict-desktopicon.patch
 
 BuildRequires:	qt-devel
 BuildRequires:	libXtst-devel
-BuildRequires:	libzip-devel
 BuildRequires:	hunspell-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	phonon-devel
 
-Requires:	kde-filesystem
-
 
 %description
 Goldendict is a feature-rich dictionary lookup program.
@@ -38,11 +34,13 @@ Scan popup functionality.
 
 %prep
 %setup -q -n goldendict-%{githash}
-%patch0 -p1
+#%patch0 -p1
 
 
 %build
 cd src
+# Fix the directory in goldendict.pro by removing apps
+sed -i 's/share\/apps\/goldendict/share\/goldendict/g' goldendict.pro
 PREFIX=%{_prefix} qmake-qt4
 make %{?_smp_mflags}
 
@@ -52,12 +50,20 @@ rm -rf %{buildroot}
 cd src
 make install INSTALL_ROOT=%{buildroot} INSTALL="install -p"
 rm -rf %{buildroot}/%{_datadir}/app-install
-desktop-file-install \
-    --delete-original \
-    --dir=%{buildroot}/%{_datadir}/applications	\
-    %{buildroot}/%{_datadir}/applications/goldendict.desktop
-install -d %{buildroot}/%{_datadir}/apps/goldendict/locale
-install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/apps/goldendict/locale
+
+# Fix the icon name in desktop file
+sed -i 's/\/usr\/share\/pixmaps\/goldendict\.png/goldendict/g' %{buildroot}/%{_datadir}/applications/goldendict.desktop
+# Fix the categories in desktop file
+desktop-file-install	\
+--add-category="Utility"	\
+--remove-category="Office"	\
+--remove-category="Education"	\
+--remove-category="Applications"	\
+--delete-original	\
+--dir=%{buildroot}%{_datadir}/applications	\
+%{buildroot}%{_datadir}/applications/goldendict.desktop
+install -d %{buildroot}/%{_datadir}/goldendict/locale
+install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale
 
 
 %clean
@@ -67,17 +73,22 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc src/LICENSE.txt
-%dir %{_datadir}/apps/goldendict/
-%dir %{_datadir}/apps/goldendict/locale/
+%dir %{_datadir}/goldendict/
+%dir %{_datadir}/goldendict/locale/
 %{_bindir}/goldendict
 %{_datadir}/applications/goldendict.desktop
 %{_datadir}/pixmaps/goldendict.png
-%{_datadir}/apps/goldendict/locale/*.qm
+%{_datadir}/goldendict/locale/*.qm
 
 
 
 %changelog
-* Wed May 11 2010 Howard Ning <mrlhwliberty at gmail.com> - 0.9.0-10
+* Tue May 11 2010 Howard Ning <mrlhwliberty at gmail.com> - 0.9.0-11
+- Drop the patch files in favor of sed.
+- Change to a more standard directory by removing app directory.
+- Remove libzip-devel and kde-filesystem requirement.
+
+* Tue May 11 2010 Howard Ning <mrlhwliberty at gmail.com> - 0.9.0-10
 - Clean up the spec file.
 - Update to the latest upstream.
 - Enhance dictiionary groups editing.


--- goldendict-desktopicon.patch DELETED ---