Author: jwrdegoede
Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27033
Modified Files:
.cvsignore monkey-bubble.spec sources
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.3.2-1
- New upstream version 0.3.2
- Add a patch to make it use gstreamer-0.10 instead of 0.8
- Add a patch to fix some warnings
- Properly install the icon
- Fix the scripts to properly handle the GConf schemas and call
scrollkeeper-update. Don't call ldconfig as there is no lib.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:52:25 -0000 1.2
+++ .cvsignore 30 Apr 2006 21:58:26 -0000 1.3
@@ -1 +1 @@
-monkey-bubble-0.1.6.tar.gz
+monkey-bubble-0.3.2.tar.gz
Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monkey-bubble.spec 2 Mar 2006 21:30:57 -0000 1.3
+++ monkey-bubble.spec 30 Apr 2006 21:58:26 -0000 1.4
@@ -1,55 +1,47 @@
-Name: monkey-bubble
-Version: 0.1.6
-Release: 1
-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/monkey-bubble-0.1.6.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libgnomeui-devel
-BuildRequires: librsvg2-devel
-BuildRequires: gstreamer-devel
-BuildRequires: libcroco-devel
-BuildRequires: pkgconfig
-BuildRequires: gettext
-BuildRequires: desktop-file-utils
-Requires(post): GConf2
+Name: monkey-bubble
+Version: 0.3.2
+Release: 1%{?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.3.2-gstreamer.patch
+Patch1: monkey-bubble-0.3.2-fixes.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libgnomeui-devel librsvg2-devel gstreamer-devel gettext
+BuildRequires: desktop-file-utils
+Requires(pre): GConf2
+Requires(post): GConf2 scrollkeeper
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
%description
-Monkey Bubble is a bust'a'move clone built using Gnometechnologies. It
+Monkey Bubble is a bust'a'move clone built using Gnome technologies. It
currently supports 1 and 2 player games, is levelcompatible with frozen bubble,
-and features svg vector graphics forresolution independent display.
-
+and features svg vector graphics for resolution independent display.
%prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
%setup -q
+%patch0 -p1 -z .gstreamer
+%patch1 -p1 -z .fixes
+%{__sed} -i s/monkey-bubble-icon/monkey-bubble/ %{name}.desktop.in
%build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
%configure --disable-schemas-install
make %{?_smp_mflags}
-
%install
rm -rf ${RPM_BUILD_ROOT}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
make install DESTDIR=${RPM_BUILD_ROOT}
%find_lang %{name}
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-install -p -D -m0644 ./pixmaps/monkey-bubble-icon.xpm
${RPM_BUILD_ROOT}/%{_datadir}/pixmaps/monkey-bubble-icon.xpm
+# 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 \
@@ -57,41 +49,69 @@
--add-category Game \
${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 \
+ ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+rmdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
%clean
rm -rf ${RPM_BUILD_ROOT}
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
%post
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas
&>/dev/null
-
-
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+/usr/bin/gconftool-2 --makefile-install-rule \
+ %{_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
+
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
%postun
-/sbin/ldconfig
-
+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
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
-%config %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/monkey*
-%{_libdir}/*.*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_bindir}/monkey-*
%{_datadir}/%{name}
+%{_datadir}/gnome
+%{_datadir}/omf
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/*
-
-%exclude %{_bindir}/gsttest
-%exclude %{_libdir}/*so
-
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
+* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.3.2-1
+- New upstream version 0.3.2
+- Add a patch to make it use gstreamer-0.10 instead of 0.8
+- Add a patch to fix some warnings
+- Properly install the icon
+- Fix the scripts to properly handle the GConf schemas and call
+ scrollkeeper-update. Don't call ldconfig as there is no lib.
+
* Fri Nov 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.1.6-0.fdr.4
- Drop .so files (for real this time).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:52:25 -0000 1.2
+++ sources 30 Apr 2006 21:58:26 -0000 1.3
@@ -1 +1 @@
-cba30bf4d1a33048cb9317b8893088c8 monkey-bubble-0.1.6.tar.gz
+37e91fa4cdbab9ec06b2ee2a5aa0683c monkey-bubble-0.3.2.tar.gz