rpms/monkey-bubble/devel monkey-bubble-0.4.0-help.patch, NONE, 1.1 monkey-bubble.spec, 1.10, 1.11

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26197

Modified Files:
	monkey-bubble.spec 
Added Files:
	monkey-bubble-0.4.0-help.patch 
Log Message:
* Fri Apr 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.0-4
- Fix building with newer docbook / gnome-doc tools


monkey-bubble-0.4.0-help.patch:

--- NEW FILE monkey-bubble-0.4.0-help.patch ---
--- monkey-bubble-0.4.0/help/C/monkey-bubble.xml.help	2007-04-27 14:25:41.000000000 +0200
+++ monkey-bubble-0.4.0/help/C/monkey-bubble.xml	2007-04-27 14:26:16.000000000 +0200
@@ -23,7 +23,7 @@
       <publishername>GNOME Documentation Project</publishername> 
     </publisher> 
     <authorgroup> 
-      <author> 
+      <author role="maintainer"> 
 	<firstname>Thomas</firstname> 
 	<surname>Cataldo</surname> 
 	<affiliation> 
@@ -55,6 +55,10 @@
 	manual, follow the directions in the 
 	<ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>. </para>
     </legalnotice> 
+    
+    <abstract role="description">
+      <para> &app; Manual V&manrevision; </para>
+    </abstract>
   </articleinfo> 
 
   <indexterm> 
--- monkey-bubble-0.4.0/help/fr/fr.po.help	2007-04-27 14:25:51.000000000 +0200
+++ monkey-bubble-0.4.0/help/fr/fr.po	2007-04-27 14:26:21.000000000 +0200
@@ -35,7 +35,7 @@
 
 #: help/C/monkey-bubble.xml:50(releaseinfo) 
 msgid "This manual describes version 0.1.7 of Monkey Bubble."
-msgstr "Ce manuel d&eacute;crit la version 0.1.7 de Monkey Bubble."
+msgstr "Ce manuel décrit la version 0.1.7 de Monkey Bubble."
 
 #: help/C/monkey-bubble.xml:53(title) 
 msgid "Feedback"
@@ -43,7 +43,7 @@
 
 #: help/C/monkey-bubble.xml:54(para) 
 msgid "To report a bug or make a suggestion regarding the Monkey Bubble application or this manual, follow the directions in the <ulink url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>."
-msgstr "Pour signaler un probl&egrave;me ou faire une suggestion concernant l'application Monkey Bubble ou le pr&eacute;sent manuel, proc&eacute;dez comme indiqu&eacute;&agrave; la <ulink url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>."
+msgstr "Pour signaler un problème ou faire une suggestion concernant l'application Monkey Bubble ou le présent manuel, procédez comme indiquéà la <ulink url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>."
 
 #: help/C/monkey-bubble.xml:64(primary) 
 msgid "bubble game"
@@ -67,7 +67,7 @@
 
 #: help/C/monkey-bubble.xml:81(para) 
 msgid "Once 3 or more bubbles of the color are sticked together at the top of the playground, they will explode."
-msgstr "Lorsque 3 (ou plus) bulles de la même couleur sont accroch&eacute;s en haut de l'aire de jeu, elles explosent."
+msgstr "Lorsque 3 (ou plus) bulles de la même couleur sont accrochés en haut de l'aire de jeu, elles explosent."
 
 #: help/C/monkey-bubble.xml:85(para) 
 msgid "To level up, you need to clear all the bubbles stuck in the playground."
@@ -83,11 +83,11 @@
 
 #: help/C/monkey-bubble.xml:100(title) 
 msgid "To Start Monkey Bubble"
-msgstr "D&eacute;marrage de Monkey Bubble"
+msgstr "Démarrage de Monkey Bubble"
 
 #: help/C/monkey-bubble.xml:101(para) 
 msgid "You can start <application>Monkey Bubble</application> in the following ways:"
-msgstr "Vous pouvez d&eacute;marrer <application>Monkey Bubble</application> en recourant &agrave; l'une des m&eacute;thodes suivantes :"
+msgstr "Vous pouvez démarrer <application>Monkey Bubble</application> en recourant à l'une des méthodes suivantes :"
 
 #: help/C/monkey-bubble.xml:106(term) 
 msgid "Applications menu"
@@ -95,7 +95,7 @@
 
 #: help/C/monkey-bubble.xml:108(para) 
 msgid "Choose <menuchoice><guimenu>Games</guimenu><guimenuitem>Monkey Bubble</guimenuitem></menuchoice>."
-msgstr "S&eacute;lectionnez <menuchoice><guimenu>Jeux</guimenu><guimenuitem>Monkey Bubble</guimenuitem></menuchoice>."
+msgstr "Sélectionnez <menuchoice><guimenu>Jeux</guimenu><guimenuitem>Monkey Bubble</guimenuitem></menuchoice>."
 
 #: help/C/monkey-bubble.xml:117(term) 
 msgid "Command line"


Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monkey-bubble.spec	10 Sep 2006 05:19:46 -0000	1.10
+++ monkey-bubble.spec	27 Apr 2007 13:35:52 -0000	1.11
@@ -1,11 +1,12 @@
 Name:             monkey-bubble
 Version:          0.4.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Game in the spirit of Frozen Bubble
 Group:            Amusements/Games
 License:          GPL
 URL:              http://monkey-bubble.tuxfamily.org/
 Source0:          http://monkey-bubble.tuxfamily.org/%{name}-%{version}.tar.gz
+Patch0:           monkey-bubble-0.4.0-help.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libgnomeui-devel librsvg2-devel gstreamer-devel gettext
 BuildRequires:    desktop-file-utils scrollkeeper gnome-doc-utils
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .help
 %{__sed} -i s/monkey-bubble-icon/monkey-bubble/ %{name}.desktop.in
 
 
@@ -45,9 +47,8 @@
 # below is the desktop file and icon stuff.
 desktop-file-install --vendor fedora --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  --add-category Application                           \
   --add-category Game                                  \
+  --add-category ActionGame                            \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
@@ -73,9 +74,7 @@
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -87,15 +86,13 @@
 %postun
 scrollkeeper-update -q || :
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%doc AUTHORS COPYING ChangeLog
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/monkey-*
 %{_datadir}/%{name}
 %{_datadir}/gnome
@@ -105,6 +102,9 @@
 
 
 %changelog
+* Fri Apr 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.0-4
+- Fix building with newer docbook / gnome-doc tools
+
 * Sun Sep 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.0-3
 - Don't own /usr/share/omf (bug 205670)