[chmsee] rebuild for xulrunner 15

Yuan Yijun bbbush at fedoraproject.org
Tue Aug 28 12:58:12 UTC 2012


commit a02259b1458b4626edbd3baa5b5870522da57556
Author: Yuan Yijun <bbbush.yuan at gmail.com>
Date:   Tue Aug 28 07:55:28 2012 -0500

    rebuild for xulrunner 15

 .gitignore                                   |    1 +
 chmsee.spec                                  |   34 ++++++++++----------------
 sources                                      |    2 +-
 3 files changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3daa4ed..7e69e00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ chmsee-1.1.0.tar.gz
 /chmsee-1.99.06.git67a1b5f0741cad2267e29b41641f99b764251d5a.tar.gz
 /chmsee-1.99.08.git339d2c358b73f355f5bd6ced9eae398d300fe099.tar.gz
 /chmsee-1.99.09.git36b47026e704970d7cea409f537d1e9c2b5c3af6.tar.gz
+/chmsee-v1.99.13.git8e97a3f8a23ba54ec29b4876113fd9244f5f8c62.tar.gz
diff --git a/chmsee.spec b/chmsee.spec
index a9fad4d..4dca4aa 100644
--- a/chmsee.spec
+++ b/chmsee.spec
@@ -1,18 +1,18 @@
-%define uvt .09.git36b47026e704970d7cea409f537d1e9c2b5c3af6
-%define alphatag 12
-%define checkout git36b4702
-%define XULRUNNER_VERSION 14
+%define uvt .13.git8e97a3f8a23ba54ec29b4876113fd9244f5f8c62
+%define alphatag 13
+%define checkout git8e97a3f
+%define XULRUNNER_VERSION 15
 
 Name:		chmsee
 Version:	1.99
-Release:	0.17.%{alphatag}.%{checkout}%{?dist}
+Release:	0.18.%{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:	%{name}-%{version}%{uvt}.tar.gz
-Patch0:		%{name}-1.99.05.git7fb12b8-fix-makefile.patch
+# with `git describe HEAD`.git`git rev-parse HEAD`
+Source0:	%{name}-v%{version}%{uvt}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -57,8 +57,8 @@ HTML 帮助文件阅读工具
 
 %prep
 %setup -q -c
-#%patch0 -p1 -b .orig
 sed -i.orig -e 's/^\(MaxVersion=\).*/\1%{XULRUNNER_VERSION}.*/' application.ini
+sed -e 's/^_\+\([^=]\+\)/\1/' data/%{name}.desktop.in > data/%{name}.desktop
 cat > %{name} <<'END'
 #!/bin/sh
 case `uname -m` in
@@ -71,17 +71,6 @@ case `uname -m` in
 esac
 exec xulrunner $XUL_LIB_DIR/%{name}/application.ini "$@"
 END
-cat > %{name}.desktop <<END
-[Desktop Entry]
-Name=Chmsee
-Exec=chmsee %f
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=chmsee-icon
-Categories=Utility;
-MimeType=application/x-chm;
-END
 
 %build
 cd src
@@ -106,7 +95,7 @@ install -p -m 755 -D %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 desktop-file-install --vendor fedora \
   --remove-key=Version \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{name}.desktop
+  data/%{name}.desktop
 
 %post
 update-desktop-database %{_datadir}/applications &>/dev/null || :
@@ -125,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog* COPYING NEWS README HACKING
+%doc AUTHORS ChangeLog* COPYING NEWS README* HACKING
 %{_datadir}/applications/*.desktop
 %{_bindir}/chmsee
 %{_libdir}/chmsee/
@@ -137,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/mimetypes/chm.svg
 
 %changelog
+* Tue Aug 28 2012 bbbush <bbbush.yuan at gmail.com> - 1.99-0.18.13.git8e97a3f
+- rebuild for xulrunner 15
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.99-0.17.12.git36b4702
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 30ef14d..54c2758 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fda2c1c6f488ae367f4620c260990975  chmsee-1.99.09.git36b47026e704970d7cea409f537d1e9c2b5c3af6.tar.gz
+b342b4eec6f246b5538c89e8dd8a8726  chmsee-v1.99.13.git8e97a3f8a23ba54ec29b4876113fd9244f5f8c62.tar.gz


More information about the scm-commits mailing list