[chmsee/f15] chmsee: update to 1.99.05 snapshot
Yuan Yijun
bbbush at fedoraproject.org
Tue Sep 20 14:27:49 UTC 2011
commit 8625ee8158983ce3a0787b840696c6eca55c5b99
Author: Yuan Yijun <bbbush.yuan at gmail.com>
Date: Tue Sep 20 22:26:45 2011 +0800
chmsee: update to 1.99.05 snapshot
.gitignore | 3 +
chmsee-1.3.1.1-fixes-gre-version.patch | 14 ----
chmsee.desktop | 11 +++
chmsee.spec | 120 ++++++++---------------------
git-1.99.05.git7fb12b8-fix-makefile.patch | 46 +++++++++++
sources | 3 +-
6 files changed, 94 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bd0b5b..117272e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+.build-*
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.desktop b/chmsee.desktop
new file mode 100644
index 0000000..dacfeb6
--- /dev/null
+++ b/chmsee.desktop
@@ -0,0 +1,11 @@
+
+[Desktop Entry]
+Name=Chmsee
+Exec=xulrunner /usr/lib/chmsee/application.ini
+Terminal=false
+Type=Application
+StartupNotify=true
+Icon=chmsee-icon
+Categories=Utility;
+MimeType=application/x-chm;
+
diff --git a/chmsee.spec b/chmsee.spec
index 03ba153..c81aa89 100644
--- a/chmsee.spec
+++ b/chmsee.spec
@@ -1,21 +1,22 @@
+%define uvt .05.git7fb12b8756bf3ee0b8cd7241512bf91b66c8d034
+%define alphatag 5
+%define checkout git7fb12b8
+
Name: chmsee
-Version: 1.3.1.1
-Release: 2%{?dist}
-Summary(zh_CN): CHM 文件阅读工具, 基于 Gtk2+
+Version: 1.99
+Release: 0.1.%{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: http://chmsee.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0: %{name}-%{version}%{uvt}.tar.gz
+Source1: chmsee.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: chmsee-1.3.1.1-fixes-gre-version.patch
+Patch1: git-1.99.05.git7fb12b8-fix-makefile.patch
-BuildRequires: intltool >= 0.34 pkgconfig >= 0.9 gettext cmake
-BuildRequires: gtk2-devel >= 2.20
-BuildRequires: libglade2-devel >= 2.0
-BuildRequires: libgcrypt-devel chmlib-devel
BuildRequires: desktop-file-utils
-BuildRequires: gecko-devel-unstable >= 1.9.1.1
+BuildRequires: xulrunner-devel >= 6.0 chmlib-devel cmake
%description
ChmSee is an HTML Help viewer for Unix/Linux. It is based on CHMLIB
@@ -55,23 +56,30 @@ HTML 帮助文件阅读工具
%prep
-%setup -q
-%patch1 -p1 -b .gre
+%setup -q -c
+%patch1 -p1 -b .orig
%build
-%cmake . -DCMAKE_SKIP_RPATH=ON
-make VERBOSE=1 %{?_smp_mflags}
+cd src && make -f *.fedora
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/chmsee
+install -p -m 644 -D *.ini *.manifest $RPM_BUILD_ROOT%{_libdir}/chmsee
+cp -ar chrome $RPM_BUILD_ROOT%{_libdir}/chmsee
+cp -ar components $RPM_BUILD_ROOT%{_libdir}/chmsee
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/chmsee/data
+install -p -m 644 -D data/*.png $RPM_BUILD_ROOT%{_datadir}/chmsee/data
+cp -ar defaults $RPM_BUILD_ROOT%{_libdir}/chmsee
+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
-%find_lang %{name}
+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
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --vendor fedora \
--remove-key=Version \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/chmsee.desktop
+ %{SOURCE1}
%post
update-desktop-database %{_datadir}/applications &>/dev/null || :
@@ -88,21 +96,22 @@ touch --no-create %{_datadir}/icons/hicolor || :
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog* COPYING NEWS README
-%{_bindir}/chmsee
+%doc AUTHORS ChangeLog* COPYING NEWS README HACKING
%{_datadir}/applications/*.desktop
+%{_libdir}/chmsee/
%{_datadir}/chmsee/
%{_datadir}/icons/hicolor/*/apps/chmsee-icon.png
%{_datadir}/mime-info/chmsee.keys
%{_datadir}/mime-info/chmsee.mime
-%{_datadir}/pixmaps/chmsee-icon.png
%{_datadir}/icons/hicolor/*/mimetypes/chm.png
%{_datadir}/icons/hicolor/*/mimetypes/chm.svg
-#{_mandir}/man1/chmsee*.1*
%changelog
+* Tue Sep 20 2011 bbbush <bbbush.yuan at gmail.com> - 1.99-0.1.5.git7fb12b8
+- Use latest snapshot to run with xulrunner 6 and above
+
* Mon Jul 04 2011 Peng Wu <pwu at redhat.com> - 1.3.1.1-2
- Upgrade gre version to 5.0
@@ -112,68 +121,3 @@ rm -rf $RPM_BUILD_ROOT
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-* Thu Dec 02 2010 bbbush <bbbush.yuan at gmail.com> - 1.2.0-2
-- fix build (-DCMAKE_SKIP_RPATH=ON); use new mimetype icon
-
-* Thu Dec 02 2010 bbbush <bbbush.yuan at gmail.com> - 1.2.0-1
-- upstream release (released on 23Jul2010)
-- add previous and next page function
-- open specified page in file.chm::page.html format
-
-* Tue Apr 13 2010 bbbush <bbbush.yuan at gmail.com> - 1.1.0-1
-- upstream release, support "recent files" and session recovery, etc.
-
-* Wed Oct 07 2009 bbbush <bbbush.yuan at gmail.com> - 1.0.7-1
-- upstream release, fixed crash
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun Jul 12 2009 bbbush <bbbush.yuan at gmail.com> - 1.0.6-1
-- update to 1.0.6
-- update project location. Chmsee moved to google code since 2009-01-05,
- co-maintained by Li Daobing and Jungle Ji
-- update build steps to use CMake
-- Chmsee 1.0.3 was released on 2009-01-10, added "copy page location" in
- context menu, updated translation
-- Chmsee 1.0.4 was released on 2009-03-14, added "drag and drop" support,
- dropped cs2w
-- Chmsee 1.0.5 was released on 2009-05-17, added fullscreen support, switched
- to CMake, supported 6 more new languages
-- Chmsee 1.0.6 was released on 2009-07-12, added index support, supported 8
- more new languages
-
-
-* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-6
-- Rebuild against newer gecko
-
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Aug 02 2008 bbbush <bbbush.yuan at gmail.com> - 1.0.1-4
-- bump version
-
-* Sat May 17 2008 bbbush <bbbush.yuan at gmail.com> - 1.0.1-3
-- update to 1.0.1
-- 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 at gmail.com> - 1.0.0-2.37
-- patch from Martin Stransky to fix crash on open files (rh#427622)
-
-* Fri Feb 22 2008 bbbush <bbbush.yuan at gmail.com> - 1.0.0-2.36
-- try build with gcc-43
-- xulrunner-gtkmozembed is in xulrunner-devel-unstable
-
-* Wed Dec 05 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.34
-- rebuild for new openssl (so.7)
-
-* Sun Nov 25 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.33
-- define HAVE_GECKO_1_9 on make command line temporarily
-
-* Sun Nov 25 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.31
-- now gecko-libs = 1.9 provided by xulrunner has offered its ld.so.conf file so RPATH is no longer required
-- fix xpcom initialize and shutdown according to
- http://benjamin.smedbergs.us/blog/2005-12-23/whats-coming-for-gtkmozembed/
-
-
diff --git a/git-1.99.05.git7fb12b8-fix-makefile.patch b/git-1.99.05.git7fb12b8-fix-makefile.patch
new file mode 100644
index 0000000..1bc7187
--- /dev/null
+++ b/git-1.99.05.git7fb12b8-fix-makefile.patch
@@ -0,0 +1,46 @@
+diff --git a/COPYING b/COPYING
+index d60c31a..623b625 100644
+--- a/COPYING
++++ b/COPYING
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ Also add information on how to contact you by electronic and paper mail.
+diff --git a/src/Makefile.fedora b/src/Makefile.fedora
+index f5a7d65..9b6ef48 100644
+--- a/src/Makefile.fedora
++++ b/src/Makefile.fedora
+@@ -1,5 +1,5 @@
+ ## -*- Mode: makefile -*-
+-LIBXUL_SDK = /usr/lib64/xulrunner-sdk-2
++LIBXUL_SDK := $(shell pkg-config --variable=sdkdir libxul)
+
+ NSPR_INCLUDES = -I/usr/include/nspr4
+ NSPR_LIBS = -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+diff --git a/src/common.mk b/src/common.mk
+index b23eb54..4c093d5 100644
+--- a/src/common.mk
++++ b/src/common.mk
+@@ -12,7 +12,7 @@ XPT = ${COMPONENTSDIR}/xpcomchm.xpt
+
+ SDK_IDL = ${LIBXUL_SDK}/idl
+ XPIDL = ${LIBXUL_SDK}/bin/xpidl
+-XPT_LINK = ${LIBXUL_SDK}/sdk/bin/xpt.py link
++XPT_LINK = python ${LIBXUL_SDK}/sdk/bin/xpt.py link
+
+ MOZ_DEBUG_DISABLE_DEFS = -DNDEBUG -DTRIMMED
+
diff --git a/sources b/sources
index 9c19b89..f288e52 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-7c226e6f518284a040ad3b9433d5e218 chmsee-1.3.1.1.tar.gz
+a4631e0c2e2b07d7ecfffa2a50ce6776 chmsee-1.99.05.git7fb12b8756bf3ee0b8cd7241512bf91b66c8d034.tar.gz
+31f4e3f58fc6851a8ea2cf5c6ad02bcd chmsee.desktop
More information about the scm-commits
mailing list