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

Yuan Yijun (bbbush) fedora-extras-commits at redhat.com
Sun Apr 15 00:57:29 UTC 2007


Author: bbbush

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

Modified Files:
	chmsee.spec 
Log Message:
mv chmsee binary to libexecdir


Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/devel/chmsee.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chmsee.spec	14 Apr 2007 15:25:41 -0000	1.3
+++ chmsee.spec	15 Apr 2007 00:56:50 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		chmsee
 Version:	1.0.0
-Release:	0.16.beta2%{?dist}
+Release:	0.17.beta2%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -14,7 +14,7 @@
 Patch1:		chmsee-1.0.0-desktop-icon.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext openssl-devel
+BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext 
 BuildRequires:	gtk2-devel >= 2.8 libglade2-devel >= 2.0
 BuildRequires:	openssl-devel chmlib-devel
 BuildRequires:	desktop-file-utils
@@ -60,7 +60,7 @@
 %patch1 -p1 -b .desktop-mimetype
 
 %build
-%configure --disable-static --enable-cpp-rtti
+%configure --disable-static 
 make %{?_smp_mflags}
 
 %install
@@ -77,12 +77,11 @@
   $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
+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}/firefox-%{firefox_version} exec %{_bindir}/%{name}.bin "\$@"
+LD_LIBRARY_PATH=%{_libdir}/firefox-%{firefox_version} exec %{_libexecdir}/%{name}/%{name} "\$@"
 EOF
-chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %post
 update-desktop-database %{_datadir}/applications &>/dev/null || :
@@ -107,7 +106,8 @@
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog NEWS TODO
 %{_bindir}/chmsee*
-%{_mandir}/man1/*.gz
+%{_libexecdir}/chmsee
+%{_mandir}/man1/chmsee*.1*
 %{_datadir}/chmsee/
 %{_datadir}/pixmaps/chmsee-icon.png
 %{_datadir}/applications/*.desktop
@@ -117,7 +117,7 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
-* Tue Apr 03 2007 Yijun Yuan <bbbush.yuan at gmail.com> - 1.0.0-0.16.beta2
+* 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




More information about the scm-commits mailing list