rpms/monkey-bubble/devel .cvsignore, 1.4, 1.5 monkey-bubble.spec, 1.11, 1.12 sources, 1.4, 1.5

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore monkey-bubble.spec sources 
Log Message:
* Fri Jun  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.0-5
- Add yelp Requires so that the help will always work (bz 243408)
- Fix display of icon in the windows titlebar
- Fix only part of the splashscreen displaying



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Aug 2006 21:01:29 -0000	1.4
+++ .cvsignore	8 Jun 2007 21:52:20 -0000	1.5
@@ -1 +1,2 @@
 monkey-bubble-0.4.0.tar.gz
+splash.svg


Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- monkey-bubble.spec	27 Apr 2007 13:35:52 -0000	1.11
+++ monkey-bubble.spec	8 Jun 2007 21:52:20 -0000	1.12
@@ -1,17 +1,18 @@
 Name:             monkey-bubble
 Version:          0.4.0
-Release:          4%{?dist}
+Release:          5%{?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
+Source1:          splash.svg
 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
 BuildRequires:    perl(XML::Parser)
-Requires:         scrollkeeper hicolor-icon-theme
+Requires:         scrollkeeper hicolor-icon-theme yelp
 Requires(pre):    GConf2
 Requires(post):   GConf2 scrollkeeper
 Requires(preun):  GConf2
@@ -26,7 +27,12 @@
 %prep
 %setup -q
 %patch0 -p1 -z .help
-%{__sed} -i s/monkey-bubble-icon/monkey-bubble/ %{name}.desktop.in
+# replace the broken included splash.svg
+cp %{SOURCE1} pixmaps
+# adjust desktop, C-code for fdo icon dir and naming
+sed -i s/%{name}-icon/%{name}/ %{name}.desktop.in
+sed -i 's|/pixmaps/%{name}-icon.png|/icons/hicolor/32x32/apps/%{name}.png|g' \
+  src/ui/ui-main.c
 
 
 %build
@@ -47,12 +53,13 @@
 # below is the desktop file and icon stuff.
 desktop-file-install --vendor fedora --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category Game                                  \
+  --remove-category GNOME                              \
+  --remove-category Application                        \
   --add-category ActionGame                            \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mv ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/monkey-bubble-icon.png \
+mv ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}-icon.png \
   ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 rmdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
@@ -102,7 +109,12 @@
 
 
 %changelog
-* Fri Apr 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.0-4
+* Fri Jun  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.0-5
+- Add yelp Requires so that the help will always work (bz 243408)
+- Fix display of icon in the windows titlebar
+- Fix only part of the splashscreen displaying
+
+* Fri Apr 27 2007 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Aug 2006 21:01:29 -0000	1.4
+++ sources	8 Jun 2007 21:52:20 -0000	1.5
@@ -1 +1,2 @@
 0de8a05c8c15e08326d244534dc30f22  monkey-bubble-0.4.0.tar.gz
+43819e335d167063304b0ebceee5b12d  splash.svg