rpms/chmsee/devel chmsee.spec,1.2,1.3

[Yuan Yijun (bbbush)]

Author: bbbush

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

Modified Files:
	chmsee.spec 
Log Message:
update to 1.0.0-beta2


Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/devel/chmsee.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chmsee.spec	24 Mar 2007 14:36:23 -0000	1.2
+++ chmsee.spec	14 Apr 2007 15:25:41 -0000	1.3
@@ -1,23 +1,24 @@
+%define firefox_version 2.0.0.3
+
 Name:		chmsee
 Version:	1.0.0
-Release:	0.12.beta%{?dist}
+Release:	0.16.beta2%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
 License:	GPL
 URL:		http://chmsee.gro.clinux.org/
-Source0:	http://chmsee.gro.clinux.org/chmsee-%{version}-beta.tar.gz
+Source0:	http://chmsee.gro.clinux.org/chmsee-%{version}-beta2.tar.gz
 # this file comes from gnochm package
 Source1:	gnochm-chmfile.png
-Patch1:		chmsee-1.0.0-desktop-mimetype.patch
+Patch1:		chmsee-1.0.0-desktop-icon.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk2-devel >= 2.8 libglade2-devel >= 2.0 chmlib-devel intltool gettext openssl-devel
+BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext openssl-devel
+BuildRequires:	gtk2-devel >= 2.8 libglade2-devel >= 2.0
+BuildRequires:	openssl-devel chmlib-devel
 BuildRequires:	desktop-file-utils
-
-# to avoid firefox rpath issue
-%define firefox_version 2.0.0.3
-BuildRequires:	gecko-devel firefox-devel = %{firefox_version}
+BuildRequires:	firefox-devel = %{firefox_version}
 Requires:	firefox = %{firefox_version}
 
 %description
@@ -55,13 +56,12 @@
 
 
 %prep
-%setup -q -n chmsee-%{version}-beta
+%setup -q -n chmsee-%{version}-beta2
 %patch1 -p1 -b .desktop-mimetype
 
 %build
-%configure
-# _smp_mflags breaks build so is disabled
-make #%{?_smp_mflags}
+%configure --disable-static --enable-cpp-rtti
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -76,6 +76,14 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/chmsee.desktop
 
+# since firefox .pc files don't contain RPATH
+mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}.bin
+cat > $RPM_BUILD_ROOT%{_bindir}/%{name} <<EOF
+#!/bin/sh
+LD_LIBRARY_PATH=%{_libdir}/firefox-%{firefox_version} exec %{_bindir}/%{name}.bin "\$@"
+EOF
+chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}
+
 %post
 update-desktop-database %{_datadir}/applications &>/dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -98,7 +106,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog NEWS TODO
-%{_bindir}/chmsee
+%{_bindir}/chmsee*
+%{_mandir}/man1/*.gz
 %{_datadir}/chmsee/
 %{_datadir}/pixmaps/chmsee-icon.png
 %{_datadir}/applications/*.desktop
@@ -108,6 +117,13 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Tue Apr 03 2007 Yijun Yuan <bbbush.yuan at gmail.com> - 1.0.0-0.16.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
+
 * Sat Mar 24 2007 Yijun Yuan <bbbush.yuan at gmail.com> - 1.0.0-0.12.beta
 - update for firefox 2.0.0.3