[lordsawar] Use a local copy of the manual for help.

Bruno Wolff III bruno at fedoraproject.org
Sat Mar 19 15:17:04 UTC 2011


commit 11edc9821fd743b3c9af7dc2a22ed5e333a925e6
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Mar 19 10:15:00 2011 -0500

    Use a local copy of the manual for help.

 lordsawar-local-manual.patch |   67 ++++++++++++++++++++++++++++++++++++++++++
 lordsawar.spec               |    9 ++++-
 2 files changed, 74 insertions(+), 2 deletions(-)
---
diff --git a/lordsawar-local-manual.patch b/lordsawar-local-manual.patch
new file mode 100644
index 0000000..835bf45
--- /dev/null
+++ b/lordsawar-local-manual.patch
@@ -0,0 +1,67 @@
+--- help/Makefile.am.orig	2011-03-19 05:40:07.000000000 -0500
++++ help/Makefile.am	2011-03-19 05:38:30.000000000 -0500
+@@ -3,7 +3,11 @@
+ helpdir = ${datadir}/gnome/help/lordsawar/C/
+ 
+ help_DATA = legal.xml \
+-            lordsawar.xml
++            lordsawar.xml \
++            lordsawar.html
++
++lordsawar.html:
++	docbook2html --nochunks -e no-valid lordsawar.xml
+ 
+ ## for html publishing install docbook-utils:
+ ## cd into this directory
+--- help/Makefile.in.orig	2011-03-19 05:40:31.000000000 -0500
++++ help/Makefile.in	2011-03-19 05:40:59.000000000 -0500
+@@ -295,7 +295,8 @@
+ EXTRA_DIST = $(help_DATA)
+ helpdir = ${datadir}/gnome/help/lordsawar/C/
+ help_DATA = legal.xml \
+-            lordsawar.xml
++            lordsawar.xml \
++            lordsawar.html
+ 
+ all: all-recursive
+ 
+@@ -667,6 +668,9 @@
+ 	tags tags-recursive uninstall uninstall-am uninstall-helpDATA
+ 
+ 
++lordsawar.html:
++	docbook2html --nochunks -e no-valid lordsawar.xml
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- src/gui/game-window.cpp.orig	2011-03-19 05:04:03.000000000 -0500
++++ src/gui/game-window.cpp	2011-03-19 05:24:40.000000000 -0500
+@@ -3801,7 +3801,7 @@
+ 
+ void GameWindow::on_online_help_activated()
+ {
+-  go_url_show ("http://www.nongnu.org/lordsawar/manual/" PACKAGE_VERSION "/lordsawar.html");
++  go_url_show ("file://" HELPDIR "/lordsawar.html");
+   return;
+ }
+ 
+--- src/gui/Makefile.am.orig	2011-03-19 05:53:20.000000000 -0500
++++ src/gui/Makefile.am	2011-03-19 05:53:37.000000000 -0500
+@@ -83,4 +83,4 @@
+    $(SDL_CFLAGS) \
+    -I$(top_srcdir)/src
+ 
+-AM_CXXFLAGS = -Wall
++AM_CXXFLAGS = -Wall -DHELPDIR=\"$(datadir)/gnome/help/lordsawar/C\"
+--- src/gui/Makefile.in.orig	2011-03-19 05:53:56.000000000 -0500
++++ src/gui/Makefile.in	2011-03-19 05:54:12.000000000 -0500
+@@ -360,7 +360,7 @@
+    $(SDL_CFLAGS) \
+    -I$(top_srcdir)/src
+ 
+-AM_CXXFLAGS = -Wall
++AM_CXXFLAGS = -Wall -DHELPDIR=\"$(datadir)/gnome/help/lordsawar/C\"
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/lordsawar.spec b/lordsawar.spec
index c74eec2..6b6ff3a 100644
--- a/lordsawar.spec
+++ b/lordsawar.spec
@@ -1,6 +1,6 @@
 Name:           lordsawar
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn-based strategy game in a fantasy setting
 
 # This is used for prereleases and such
@@ -12,12 +12,13 @@ Group:          Amusements/Games
 License:        GPLv2+ and GFDLv1.1+
 URL:            http://savannah.nongnu.org/projects/%{name}
 Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{rel_version}.tar.gz
+Patch1:         lordsawar-local-manual.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libglademm24-devel gtkmm24-devel gettext desktop-file-utils
 BuildRequires:  SDL-devel SDL_image-devel SDL_mixer-devel expat-devel libsigc++20-devel
 BuildRequires:  boost-devel libuuid-devel libtiff-devel libvorbis-devel
-BuildRequires:  libjpeg-devel libtar-devel
+BuildRequires:  libjpeg-devel libtar-devel docbook-utils
 BuildRequires:  intltool >= 0.35.0
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -28,6 +29,7 @@ LordsAWar! is a turn-based strategy game set in a fantasy setting.
 
 %prep
 %setup -qn %{name}-%{rel_version}
+%patch1
 sed -i.orig -e "s/Comment=Play a clone of Warlords II/Comment=Play a turn-based strategy game/" dat/lordsawar.desktop.in.in
 
 
@@ -79,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Mar 19 2011 Bruno Wolff III <bruno at wolff.to> 0.2.0-2
+- Use a local copy of the manual for help
+
 * Thu Mar 17 2011 Bruno Wolff III <bruno at wolff.to> 0.2.0-1
 - 0.2.0 final
 - Release notice: http://savannah.nongnu.org/forum/forum.php?forum_id=6751


More information about the scm-commits mailing list