[chmsee] do not hardcode libdir in desktop file

[Yuan Yijun]

commit 3f9fb875f66a13104a4aa1e7414de4f4535df8ec
Author: Yuan Yijun <bbbush.yuan at gmail.com>
Date:   Sun Sep 25 22:00:15 2011 +0800

    do not hardcode libdir in desktop file

 .gitignore     |    1 -
 chmsee.desktop |   11 -----------
 chmsee.spec    |   33 ++++++++++++++++++++++++++++++---
 sources        |    1 -
 4 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 117272e..dff03a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ chmsee-1.1.0.tar.gz
 /chmsee-1.2.0.tar.gz
 /chmsee-1.3.1.1.tar.gz
 /chmsee-1.99.05.git7fb12b8756bf3ee0b8cd7241512bf91b66c8d034.tar.gz
-/chmsee.desktop
diff --git a/chmsee.spec b/chmsee.spec
index f33fc55..c8ff365 100644
--- a/chmsee.spec
+++ b/chmsee.spec
@@ -4,14 +4,13 @@
 
 Name:		chmsee
 Version:	1.99
-Release:	0.2.%{alphatag}.%{checkout}%{?dist}
+Release:	0.3.%{alphatag}.%{checkout}%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 XULRunner
 Summary:	HTML Help viewer for Unix/Linux
 Group:		Applications/Publishing
 License:	GPLv2
 URL:		http://code.google.com/p/chmsee
 Source0:	%{name}-%{version}%{uvt}.tar.gz
-Source1:	chmsee.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1:		git-1.99.05.git7fb12b8-fix-makefile.patch
 
@@ -58,6 +57,29 @@ HTML 帮助文件阅读工具
 %prep
 %setup -q -c
 %patch1 -p1 -b .orig
+cat > %{name} <<'END'
+#!/bin/sh
+case `uname -m` in
+	x86_64 | ia64 | s390 )
+		XUL_LIB_DIR="/usr/lib64"
+		;;
+	* )
+		XUL_LIB_DIR="/usr/lib"
+		;;
+esac
+xulrunner $XUL_LIB_DIR/%{name}/application.ini
+END
+cat > %{name}.desktop <<END
+[Desktop Entry]
+Name=Chmsee
+Exec=chmsee
+Terminal=false
+Type=Application
+StartupNotify=true
+Icon=chmsee-icon
+Categories=Utility;
+MimeType=application/x-chm;
+END
 
 %build
 cd src
@@ -77,11 +99,12 @@ mv data/icons -t $RPM_BUILD_ROOT%{_datadir}
 install -p -m 644 -D data/chmsee-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/chmsee-icon.png
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/mime-info
 install -p -m 644 -D data/*.keys data/*.mime $RPM_BUILD_ROOT%{_datadir}/mime-info
+install -p -m 755 -D %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 desktop-file-install --vendor fedora \
   --remove-key=Version \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE1}
+  %{name}.desktop
 
 %post
 update-desktop-database %{_datadir}/applications &>/dev/null || :
@@ -102,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* COPYING NEWS README HACKING
 %{_datadir}/applications/*.desktop
+%{_bindir}/chmsee
 %{_libdir}/chmsee/
 %{_datadir}/chmsee/
 %{_datadir}/icons/hicolor/*/apps/chmsee-icon.png
@@ -111,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/mimetypes/chm.svg
 
 %changelog
+* Sun Sep 25 2011 bbbush <bbbush.yuan at gmail.com> - 1.99-0.3.5.git7fb12b8
+- do not hardcode libdir in desktop file
+
 * Wed Sep 21 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.99-0.2.5.git7fb12b8
 - Build with $RPM_OPT_FLAGS and $RPM_LD_FLAGS.
 
diff --git a/sources b/sources
index f288e52..26f2c0c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 a4631e0c2e2b07d7ecfffa2a50ce6776  chmsee-1.99.05.git7fb12b8756bf3ee0b8cd7241512bf91b66c8d034.tar.gz
-31f4e3f58fc6851a8ea2cf5c6ad02bcd  chmsee.desktop