Author: bbbush
Update of /cvs/extras/rpms/chmsee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5954
Modified Files: chmsee-1.0.1-xulrunner-1.9.patch chmsee.spec Log Message: chmsee: in configure, requires nspr, now build and work fine
chmsee-1.0.1-xulrunner-1.9.patch:
Index: chmsee-1.0.1-xulrunner-1.9.patch =================================================================== RCS file: /cvs/extras/rpms/chmsee/devel/chmsee-1.0.1-xulrunner-1.9.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- chmsee-1.0.1-xulrunner-1.9.patch 1 Jun 2008 02:26:08 -0000 1.1 +++ chmsee-1.0.1-xulrunner-1.9.patch 1 Jun 2008 07:51:22 -0000 1.2 @@ -1,6 +1,24 @@ -diff -up chmsee-1.0.1/configure.xulrunner-unstable chmsee-1.0.1/configure ---- chmsee-1.0.1/configure.xulrunner-unstable 2008-05-17 16:42:35.000000000 +0800 -+++ chmsee-1.0.1/configure 2008-05-17 19:08:30.000000000 +0800 +diff -up chmsee-1.0.1/configure.xulrunner-1.9 chmsee-1.0.1/configure +--- chmsee-1.0.1/configure.xulrunner-1.9 2008-05-17 16:42:35.000000000 +0800 ++++ chmsee-1.0.1/configure 2008-06-01 15:44:48.000000000 +0800 +@@ -5835,7 +5835,7 @@ if test -n "$GECKO_CFLAGS"; then + ac_status=$? + $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider" 2>/dev/null` ++ pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider" --cflags nspr 2>/dev/null` + else + pkg_failed=yes + fi +@@ -5851,7 +5851,7 @@ if test -n "$GECKO_LIBS"; then + ac_status=$? + $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$gecko_provider" 2>/dev/null` ++ pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$gecko_provider" --libs nspr 2>/dev/null` + else + pkg_failed=yes + fi @@ -5901,7 +5901,7 @@ fi if test "x$enable_gecko" != "xno" ; then
Index: chmsee.spec =================================================================== RCS file: /cvs/extras/rpms/chmsee/devel/chmsee.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- chmsee.spec 1 Jun 2008 02:26:08 -0000 1.25 +++ chmsee.spec 1 Jun 2008 07:51:22 -0000 1.26 @@ -1,6 +1,6 @@ Name: chmsee Version: 1.0.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary(zh_CN): CHM 文件阅读工具, 基于 Gtk2+ Summary: A Gtk+2 CHM document viewer Group: Applications/Publishing @@ -15,7 +15,7 @@
BuildRequires: intltool >= 0.34 pkgconfig >= 0.9 gettext BuildRequires: gtk2-devel >= 2.8 libglade2-devel >= 2.0 -BuildRequires: openssl-devel chmlib-devel +BuildRequires: libgcrypt-devel chmlib-devel BuildRequires: desktop-file-utils BuildRequires: gecko-devel-unstable >= 1.9
@@ -56,11 +56,11 @@ %prep %setup -q %patch1 -p1 -b .desktop-mimetype -%patch2 -p1 -b .xulrunner-unstable +%patch2 -p1 -b .xulrunner-1.9
%build -%configure --disable-static --with-gecko=mozilla -make %{?_smp_mflags} CPPFLAGS=-DHAVE_GECKO_1_9 +%configure --with-gecko=libxul +make %{?_smp_mflags}
%install rm -rf $RPM_BUILD_ROOT @@ -108,9 +108,10 @@ %{_datadir}/icons/hicolor/*/apps/chmsee.png
%changelog -* Sat May 17 2008 bbbush bbbush.yuan@gmail.com - 1.0.1-1 +* Sat May 17 2008 bbbush bbbush.yuan@gmail.com - 1.0.1-3 - update to 1.0.1 -- specify gecko-provider to "mozilla" +- specify gecko-provider to "libxul", add nspr in patch to configure +- BR libgcrypt-devel instead of openssl-devel
* Fri Apr 25 2008 bbbush bbbush.yuan@gmail.com - 1.0.0-2.37 - patch from Martin Stransky to fix crash on open files (rh#427622)
scm-commits@lists.fedoraproject.org