rpms/xemacs/devel xemacs.spec,1.6,1.7 xemacs.desktop,1.1,1.2

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19634

Modified Files:
	xemacs.spec xemacs.desktop 
Log Message:
Use d-f-i to install .desktop, fix X-* categories, update desktop database.


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xemacs.spec	29 Jun 2005 21:27:37 -0000	1.6
+++ xemacs.spec	29 Jun 2005 21:35:00 -0000	1.7
@@ -44,6 +44,7 @@
 BuildRequires:  compface
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  desktop-file-utils
 %if 0%{!?_without_mule:1}
 BuildRequires:  Canna-devel
 BuildRequires:  FreeWnn-devel
@@ -282,9 +283,12 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/termcap*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/applications
-install -m 644 %{SOURCE6} \
-  $RPM_BUILD_ROOT%{_datadir}/applications/net-xemacs.desktop
+desktop-file-install \
+  --vendor=fedora \
+  --mode=644 \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE6}
 
 # lockdir
 install -dm 1777 $RPM_BUILD_ROOT%{_localstatedir}/lock/xemacs
@@ -341,6 +345,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+
+%postun
+update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+
 %post common
 alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40
 
@@ -407,6 +417,8 @@
 - Improve package summaries and descriptions, reformat/clean up specfile.
 - Bring back Wnn support.
 - Fine tune dependencies and options of "--without mule" builds.
+- Use desktop-file-install for installing the desktop entry, fix up X-*
+  categories, update desktop database at post (un)install time.
 
 * Thu May  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-3
 - Avoid stack corruption in open-network-stream when built with gcc4


Index: xemacs.desktop
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs.desktop	1 Mar 2005 22:11:36 -0000	1.1
+++ xemacs.desktop	29 Jun 2005 21:35:00 -0000	1.2
@@ -29,6 +29,6 @@
 Icon=xemacs
 Type=Application
 Terminal=false
-Categories=Application;Development;TextEditor;X-Red-Hat-Extra;
+Categories=Application;Development;TextEditor;
 Encoding=UTF-8
 StartupWMClass=Emacs