rpms/kasumi/F-13 kasumi.spec,1.35,1.36

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/kasumi/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4301

Modified Files:
	kasumi.spec 
Log Message:
* Tue Mar  9 2010 Akira TAGOH <tagoh at redhat.com> - 2.5-3
- Get rid of .desktop file again. (#546147)


Index: kasumi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/F-13/kasumi.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- kasumi.spec	22 Dec 2009 08:37:35 -0000	1.35
+++ kasumi.spec	9 Mar 2010 08:31:49 -0000	1.36
@@ -1,11 +1,11 @@
 Name:    kasumi
 Version: 2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils, gtk2-devel anthy-devel
+BuildRequires: gtk2-devel anthy-devel
 Source0: http://jaist.dl.sourceforge.jp/kasumi/41436/%{name}-%{version}.tar.gz
 
 
@@ -27,12 +27,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-# remove .desktop file so that kasumi is accessible from scim panel and it's not necessary for other users.
-#rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
-
-sed -i -e 's/Icon=\(.*\)\.png/Icon=\1/g' $RPM_BUILD_ROOT%{_datadir}/applications/kasumi.desktop
-touch -r $RPM_BUILD_DIR/%{name}-%{version}/kasumi.desktop.in $RPM_BUILD_ROOT%{_datadir}/applications/kasumi.desktop
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications --remove-category=Applications --delete-original $RPM_BUILD_ROOT%{_datadir}/applications/kasumi.desktop
+# remove .desktop file so that kasumi is accessible from scim panel/ibus panel and it's not necessary for other users.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 %find_lang %{name}
 
@@ -46,11 +42,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/kasumi
 %{_mandir}/man1/kasumi.1*
 %{_datadir}/pixmaps/kasumi.png
-%{_datadir}/applications/kasumi.desktop
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 
 %changelog
+* Tue Mar  9 2010 Akira TAGOH <tagoh at redhat.com> - 2.5-3
+- Get rid of .desktop file again. (#546147)
+
 * Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 2.5-2
 - improve the spec file (#546147)