rpms/goldendict/devel goldendict.spec,1.5,1.6

[helloworld1]

Author: helloworld1

Update of /cvs/pkgs/rpms/goldendict/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8448

Modified Files:
	goldendict.spec 
Log Message:



Index: goldendict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goldendict/devel/goldendict.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- goldendict.spec	11 May 2010 13:39:05 -0000	1.5
+++ goldendict.spec	11 May 2010 15:56:26 -0000	1.6
@@ -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
-BuildRequires:  qt-webkit-devel
-
-Requires:	kde-filesystem
+BuildRequires:	qt-webkit-devel
 
 
 %description
@@ -39,11 +35,13 @@ Scan popup functionality.
 
 %prep
 %setup -q -n goldendict-%{githash}
-%patch0 -p1
+#%patch0 -p1
 
 
 %build
 cd src
+# Fix the directory in goldendict.pro
+sed -i 's/share\/apps\/goldendict/share\/goldendict/g' goldendict.pro
 PREFIX=%{_prefix} qmake-qt4
 make %{?_smp_mflags}
 
@@ -53,12 +51,20 @@ rm -rf %{buildroot}
 cd src
 make install INSTALL_ROOT=%{buildroot} INSTALL="install -p"
 rm -rf %{buildroot}/%{_datadir}/app-install
+
+# 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}/apps/goldendict/locale
-install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/apps/goldendict/locale
+install -d %{buildroot}/%{_datadir}/goldendict/locale
+install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale
 
 
 %clean
@@ -68,12 +74,12 @@ 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