rpms/teg/F-9 teg-fix-help.patch,NONE,1.1 teg.spec,1.11,1.12

cheese cheese at fedoraproject.org
Fri Jul 17 15:26:25 UTC 2009


Author: cheese

Update of /cvs/pkgs/rpms/teg/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28586

Modified Files:
	teg.spec 
Added Files:
	teg-fix-help.patch 
Log Message:
fix help

teg-fix-help.patch:
 teg.sgml |   40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

--- NEW FILE teg-fix-help.patch ---

--- teg-0.11.2/docs/gnome-help/C/teg.sgml.orig	2009-07-11 18:26:01.000000000 +0200

+++ teg-0.11.2/docs/gnome-help/C/teg.sgml	2009-07-11 18:53:07.000000000 +0200

@@ -1,13 +1,12 @@

-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[

-				<!-- if not using PNG graphic, replace reference above with

-						 .....PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[

-				 -->

+<?xml version="1.0"?>

+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 

+"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [

 <!ENTITY version "1.2.0"> 

 ]>

 

 

 <!-- 

-			(Do not remove this comment block.)

+	(Do not remove this comment block.)

 	Maintained by the GNOME Documentation Project

 	http://developer.gnome.org/projects/gdp

 	Template version: 1.0.3

@@ -18,7 +17,7 @@

 <!-- =============Document Header ============================= -->

 

 <article id="index"> <!-- please do not change the id -->

-	<artheader>

+	<articleinfo>

 	<title>Tenes Empanadas Graciela Manual</title>

 			<copyright>

 				<year>2002</year>

@@ -61,12 +60,11 @@

 		<releaseinfo>

 			This is version 1.0 of the TEG manual.

 		</releaseinfo>

-	</artheader>

-	

+	</articleinfo>

 	<sect1 id="introduction">

 		<title>Introduction</title>

 		<para>Tenes Empandas Graciela (TEG), is a clone of an Argentinian game

-		called 'Plan T�ctico y Estr�tegico de la Guerra', a

+		called 'Plan Táctico y Estrátegico de la Guerra', a

 		modified clone of the turn based strategy game 'Risk'.

 		It is a multi-player game that can be played across the Internet.

 		</para>

@@ -366,17 +364,17 @@

 			So I'm not sure about the differences between both games. If you notice them, please tell me.

 			So far, here is what some TEG players told me:

 			</para>

-			<table frame=all><title>TEG vs. Risk</title>

+			<table frame="all"><title>TEG vs. Risk</title>

 			<tgroup cols="3">

-			<colspec colname=c1>

-			<colspec colname=c2>

-			<colspec colname=c3>

-			<spanspec spanname=hspan namest=c1 nameend=c3 align=center>

+			<colspec colname="c1">

+			<colspec colname="c2">

+			<colspec colname="c3">

+			<spanspec spanname="hspan" namest="c1" nameend="c3" align="center">

 			<thead>

 			<row>

-				<entry align=center>Topic</entry>

-				<entry align=center>TEG</entry>

-				<entry align=center>Risk</entry>

+				<entry align="center">Topic</entry>

+				<entry align="center">TEG</entry>

+				<entry align="center">Risk</entry>

 			</row>

 			</thead>

 			<tbody>

@@ -412,11 +410,15 @@

 				<entry></entry>

 			</row>

 			<row>

-				<entry spanname=hspan>If you notice any other differences, mail it to the list <email>teg-list at lists.sourceforge.net</email>

+				<entry spanname="hspan">If you notice any other differences, mail it to the list <email>teg-list at lists.sourceforge.net</email>

 				Remember that I don't know the Risk rules!

 				</entry>

 			</row>

 			</tbody>

+			</spanspec>

+			</colspec>

+			</colspec>

+			</colspec>

 			</tgroup>

 			</table>

 		</sect2>

@@ -442,7 +444,7 @@

 		<sect2 id="history">

 			<title>Brief history of TEG</title>

 

-			<para>Sebasti�n Cativa Tolosa, once told me to do this game. I think that

+			<para>Sebastián Cativa Tolosa, once told me to do this game. I think that

 			was in 1996, in a chat we were having in the University. Well, we started

 			to think the game. But I don't know why, the project died after 3 or 4 months.

 			In 1998, the project was reactivated, but after 2 weeks it died again :(.


Index: teg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teg/F-9/teg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- teg.spec	27 Jun 2009 17:26:58 -0000	1.11
+++ teg.spec	17 Jul 2009 15:26:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           teg
 Version:        0.11.2
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Turn based strategy game
 Group:          Amusements/Games
 License:        GPLv2
@@ -9,7 +9,8 @@ Source0:        http://downloads.sourcef
 Source1:        fedora-teg.desktop
 Patch0:         teg_libxml.patch
 #Patch1:         teg_themes.patch
-Patch2:         teg-disable-help.patch
+#Patch2:         teg-disable-help.patch
+Source2:         teg-fix-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tidy pkgconfig glib2-devel libxml2-devel libgnomeui-devel
@@ -27,8 +28,7 @@ Guerra, a turn based strategy game. Some
 %prep
 %setup -q 
 %patch0 -p1
-#%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 for file in AUTHORS COPYING README TODO PEOPLE ChangeLog; do
     iconv -f iso8859-1 -t utf-8 < $file > $file.$$
     mv -f $file.$$  $file
@@ -48,6 +48,8 @@ mv -f $RPM_BUILD_ROOT/%{_datadir}/pixmap
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Games/teg.desktop
 desktop-file-install --vendor="fedora"               \
   --dir=$RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+patch -p1 < %{SOURCE2}
+mv -f $RPM_BUILD_DIR/%{?buildsubdir}/docs/gnome-help/C/teg.sgml $RPM_BUILD_ROOT/%{_datadir}/gnome/help/teg/C/teg.xml
 
 %find_lang %{name}
 
@@ -78,7 +80,7 @@ if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/teg.schemas > /dev/null || :
-fi  
+fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -96,14 +98,16 @@ if [ -x %{_bindir}/gtk-update-icon-cache
 fi
 
 %changelog
-* Sat Jun 27 2009 josef radinger <cheese at nosuchhost.net> 
+* Sat Jul 11 2009 josef radinger <cheese at nosuchhost.net>
+- 0.11.2-19
+- fix and reenable help
+
+* Sat Jun 27 2009 josef radinger <cheese at nosuchhost.net>
 - 0.11.2-18
 - disable help
 
-* Tue Aug 26 2008 josef radinger <cheese at nosuchhost.net>
-- 0.11.2-17
-- testcommit
-- testcommit2
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Fri Aug 22 2008 josef radinger <cheese at nosuchhost.net>
 - 0.11.2-16




More information about the fedora-extras-commits mailing list