rpms/chmsee/devel chmsee.spec,1.14,1.15

[Yuan Yijun (bbbush)]

Author: bbbush

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

Modified Files:
	chmsee.spec 
Log Message:
try to use gecko >= 1.9


Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/devel/chmsee.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- chmsee.spec	10 Nov 2007 15:12:54 -0000	1.14
+++ chmsee.spec	25 Nov 2007 01:52:56 -0000	1.15
@@ -1,8 +1,6 @@
-%define gecko_version 1.8.1.9
-
 Name:		chmsee
 Version:	1.0.0
-Release:	1.29%{?dist}
+Release:	1.30%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -18,8 +16,7 @@
 BuildRequires:	gtk2-devel >= 2.8 libglade2-devel >= 2.0
 BuildRequires:	openssl-devel chmlib-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	gecko-devel = %{gecko_version}
-Requires:	gecko-libs = %{gecko_version}
+BuildRequires:	gecko-devel >= 1.9
 
 %description
 A gtk2 chm document viewer. 
@@ -76,13 +73,6 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/chmsee.desktop
 
-# since firefox .pc files don't contain RPATH
-install -p -m 755 -D $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/%{name}
-cat > $RPM_BUILD_ROOT%{_bindir}/%{name} <<EOF
-#!/bin/sh
-LD_LIBRARY_PATH=%{_libdir}/gecko-libs-%{gecko_version} exec %{_libexecdir}/%{name}/%{name} "\$@"
-EOF
-
 %post
 update-desktop-database %{_datadir}/applications &>/dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -105,8 +95,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README* COPYING AUTHORS ChangeLog NEWS* TODO
-%{_bindir}/chmsee*
-%{_libexecdir}/chmsee
+%{_bindir}/chmsee
 %{_mandir}/man1/chmsee*.1*
 %{_datadir}/chmsee/
 %{_datadir}/pixmaps/chmsee-icon.png
@@ -117,6 +106,9 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Sun Nov 25 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.30
+- now gecko-libs = 1.9 provided by xulrunner has offered its ld.so.conf file so RPATH is no longer required
+
 * Sat Nov 10 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.29
 - should be BuildRequires: gecko-devel
 - but since /usr/lib/gecko-libs-1.8.1.9 is still not there, this build will not work
@@ -124,19 +116,4 @@
 * Sat Nov 10 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.28
 - try build for gecko-libs-1.8.1.9
 
-* Sat Aug 11 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.23
-- update to 1.0.0
-- build for firefox-2.0.0.6
-- update License field to GPLv2
-
-* Sat Jul 21 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-0.22.beta2
-- fix desktop file
-
-* Sun Apr 15 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-0.17.beta2
-- update to beta2
-- use pkg-config to find gecko, don't use RPATH
-- add "auto detect charset" to option dialog for those HTML with no encoding
-- add popup for URL links
-- add "zoom in/out" button
-