rpms/monkey-bubble/FC-5 monkey-bubble-0.3.2-fixes.patch, 1.2, 1.3 monkey-bubble-0.3.2-gstreamer.patch, 1.2, 1.3 .cvsignore, 1.4, 1.5 monkey-bubble.spec, 1.6, 1.7 sources, 1.4, 1.5
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Thu Aug 3 06:31:12 UTC 2006
- Previous message: rpms/torque/FC-3 torque-2.1.2-pam-getpwnam.patch, NONE, 1.1 torque.spec, 1.8, 1.9
- Next message: rpms/sylpheed-claws-plugins/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sylpheed-claws-plugins.spec, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/monkey-bubble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459
Modified Files:
.cvsignore monkey-bubble.spec sources
Added Files:
monkey-bubble-0.3.2-fixes.patch
monkey-bubble-0.3.2-gstreamer.patch
Log Message:
Revert to 0.3.2 for FC-5 as 0.4.0 requires a newer gtk then is available in FC-5
monkey-bubble-0.3.2-fixes.patch:
Index: monkey-bubble-0.3.2-fixes.patch
===================================================================
RCS file: monkey-bubble-0.3.2-fixes.patch
diff -N monkey-bubble-0.3.2-fixes.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ monkey-bubble-0.3.2-fixes.patch 3 Aug 2006 06:31:12 -0000 1.3
@@ -0,0 +1,101 @@
+--- monkey-bubble-0.3.2/src/ui/ui-network-client.c.fixes 2004-06-29 08:53:46.000000000 +0200
++++ monkey-bubble-0.3.2/src/ui/ui-network-client.c 2006-04-30 21:02:10.000000000 +0200
+@@ -145,21 +145,21 @@
+ list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
+
+ column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
+- "text",0);
++ "text",0, (char *)NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
+
+ column = gtk_tree_view_column_new();
+
+ column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
+- "active",1);
++ "active",1, (char *)NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
+
+ column = gtk_tree_view_column_new();
+
+ column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
+- "active",2);
++ "active",2, (char *)NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
+
+--- monkey-bubble-0.3.2/src/ui/ui-network-server.c.fixes 2004-06-29 08:53:46.000000000 +0200
++++ monkey-bubble-0.3.2/src/ui/ui-network-server.c 2006-04-30 21:02:10.000000000 +0200
+@@ -155,21 +155,21 @@
+ list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
+
+ column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
+- "text",0);
++ "text",0, (char *)NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
+
+ column = gtk_tree_view_column_new();
+
+ column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
+- "active",1);
++ "active",1, (char *)NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
+
+ column = gtk_tree_view_column_new();
+
+ column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
+- "active",2);
++ "active",2, (char *)NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
+
+--- monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c.fixes 2004-06-29 08:53:44.000000000 +0200
++++ monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c 2006-04-30 21:05:22.000000000 +0200
+@@ -519,6 +519,7 @@
+ EggCellRendererKeys *keys;
+ GtkWidget *label;
+ GtkWidget *eventbox;
++ GtkWidget **double_ptr;
+
+ celltext = GTK_CELL_RENDERER_TEXT (cell);
+ keys = EGG_CELL_RENDERER_KEYS (cell);
+@@ -551,8 +552,9 @@
+ eventbox = g_object_new (pointless_eventbox_subclass_get_type (),
+ NULL);
+ keys->edit_widget = eventbox;
++ double_ptr = &(keys->edit_widget);
+ g_object_add_weak_pointer (G_OBJECT (keys->edit_widget),
+- (void**) &keys->edit_widget);
++ (void**) double_ptr);
+
+ label = gtk_label_new (NULL);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+@@ -586,9 +588,9 @@
+ }
+
+ void
+-egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
+- guint keyval,
+- GdkModifierType mask)
++egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
++ guint keyval,
++ EggVirtualModifierType mask)
+ {
+ char *text;
+ gboolean changed;
+@@ -628,9 +630,9 @@
+ }
+
+ void
+-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
+- guint *keyval,
+- GdkModifierType *mask)
++egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
++ guint *keyval,
++ EggVirtualModifierType *mask)
+ {
+ g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
+
monkey-bubble-0.3.2-gstreamer.patch:
Index: monkey-bubble-0.3.2-gstreamer.patch
===================================================================
RCS file: monkey-bubble-0.3.2-gstreamer.patch
diff -N monkey-bubble-0.3.2-gstreamer.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ monkey-bubble-0.3.2-gstreamer.patch 3 Aug 2006 06:31:12 -0000 1.3
@@ -0,0 +1,420 @@
+--- monkey-bubble-0.3.2/configure.in.gstreamer 2004-07-02 08:37:35.000000000 +0200
++++ monkey-bubble-0.3.2/configure.in 2006-04-30 22:06:54.000000000 +0200
+@@ -68,8 +68,7 @@
+ PKG_CHECK_MODULES(LIBMONKEYAUDIO_A,[
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ ])
+ AC_SUBST(LIBMONKEYAUDIO_A_CFLAGS)
+ AC_SUBST(LIBMONKEYAUDIO_A_LIBS)
+@@ -88,8 +87,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ ])
+--- monkey-bubble-0.3.2/src/audio/sound-manager.c.gstreamer 2004-07-02 08:30:15.000000000 +0200
++++ monkey-bubble-0.3.2/src/audio/sound-manager.c 2006-04-30 22:26:35.000000000 +0200
+@@ -20,7 +20,6 @@
+ #include "sound-manager.h"
+ #include "playground.h"
+ #include <gst/gst.h>
+-#include <gst/gconf/gconf.h>
+ #define PRIVATE(sound_manager) (sound_manager->private)
+
+ static GObjectClass* parent_class = NULL;
+@@ -28,17 +27,11 @@
+ struct SoundManagerPrivate {
+ GstElement * main_bin;
+ GstElement * filesrc;
+- GstElement * oggdemux;
++ GstElement * oggdemux;
+ GstElement * vorbis_dec;
+- GstElement * audioconvert;
++ GstElement * audioconvert;
+ GstElement * output;
+-
+- gboolean new_pad_ok;
+- gboolean is_playing;
+- gint idle_id;
+-
+- GThread * loop_thread;
+- gchar * current_music_path;
++ gchar * current_music_path;
+ };
+
+
+@@ -119,16 +112,31 @@
+ return FALSE;
+ }
+
+-static void eos(GstElement *e ,gpointer user_data) {
+- g_print("end of fie..\n");
+-
+- // g_idle_add(ck,user_data);
+- // g_idle_add(start_play,mbin);
+- g_timeout_add(100, restart_play,user_data);
+-}
+-static void error_handler(GstElement * e,GObject * o,gchar * string,gpointer data) {
+- g_print("error : %s\n",string);
++static gboolean
++bus_call (GstBus *bus,
++ GstMessage *msg,
++ gpointer data)
++{
++ switch (GST_MESSAGE_TYPE (msg)) {
++ case GST_MESSAGE_EOS:
++ g_timeout_add(100, restart_play, data);
++ break;
++ case GST_MESSAGE_ERROR: {
++ gchar *debug;
++ GError *err;
++
++ gst_message_parse_error (msg, &err, &debug);
++ g_free (debug);
++
++ g_print ("Error: %s\n", err->message);
++ g_error_free (err);
++ break;
++ }
++ default:
++ break;
++ }
+
++ return TRUE;
+ }
+
+
+@@ -139,8 +147,7 @@
+ sound_manager = SOUND_MANAGER (g_object_new (TYPE_SOUND_MANAGER, NULL));
+
+ dp = PRIVATE(sound_manager);
+-
+- dp->is_playing = FALSE;
++ dp->main_bin = NULL;
+ return sound_manager;
+ }
+
+@@ -148,43 +155,11 @@
+ static void
+ stop_play(SoundManager * m)
+ {
+-
+- if( sound_active) {
+-
+- if( PRIVATE(m)->is_playing ) {
+-
+- PRIVATE(m)->is_playing = FALSE;
+- g_thread_join( PRIVATE(m)->loop_thread);
+-
+- gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
+- gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin));
+- }
+-
+-
+-
+- g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
+-
+- PRIVATE(m)->output = NULL;
+- PRIVATE(m)->main_bin = NULL;
+- PRIVATE(m)->vorbis_dec = NULL;
+- PRIVATE(m)->filesrc = NULL;
+- }
+-}
+-
+-static gpointer
+-loop(gpointer data)
+-{
+- SoundManager * m;
+- m = SOUND_MANAGER(data);
+- while( PRIVATE(m)->is_playing) {
+- g_usleep(10*1000);
+- if( gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin)) == FALSE) {
+- PRIVATE(m)->is_playing = FALSE;
+- }
+-
+- }
+-
+- return NULL;
++ if( PRIVATE(m)->main_bin ) {
++ gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
++ g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
++ PRIVATE(m)->main_bin = NULL;
++ }
+ }
+
+
+@@ -193,29 +168,9 @@
+ GObject *new_pad,
+ SoundManager * m)
+ {
+-
+- gst_element_set_state (PRIVATE(m)->main_bin, GST_STATE_PAUSED);
+-
+- gst_bin_add_many(GST_BIN(PRIVATE(m)->main_bin),
+- PRIVATE(m)->vorbis_dec,
+- PRIVATE(m)->audioconvert,
+- PRIVATE(m)->output,
+- NULL);
+-
+-
+- gst_element_link_many(
+- PRIVATE(m)->vorbis_dec,
+- PRIVATE(m)->audioconvert,
+- PRIVATE(m)->output,
+- NULL);
+-
+- GstPad * pad = gst_element_get_pad( GST_ELEMENT(PRIVATE(m)->vorbis_dec),"sink");
+-
+- gst_pad_link( GST_PAD(new_pad), pad);
+- PRIVATE(m)->new_pad_ok = TRUE;
+-
+-
+- gst_element_set_state (GST_ELEMENT(PRIVATE(m)->main_bin), GST_STATE_PLAYING);
++ GstPad *sinkpad = gst_element_get_pad (PRIVATE(m)->vorbis_dec, "sink");
++ gst_pad_link (GST_PAD(new_pad), sinkpad);
++ gst_object_unref (sinkpad);
+ }
+
+
+@@ -223,47 +178,41 @@
+ start_play(SoundManager *m, gchar * path)
+ {
+ if( sound_active) {
+- PRIVATE(m)->new_pad_ok = FALSE;
+ PRIVATE(m)->main_bin = gst_pipeline_new("bin");
+ PRIVATE(m)->filesrc = gst_element_factory_make("filesrc","filesrc");
+ PRIVATE(m)->oggdemux = gst_element_factory_make("oggdemux","oggdemux");
+ PRIVATE(m)->vorbis_dec = gst_element_factory_make("vorbisdec","vorbisdec");
+ PRIVATE(m)->audioconvert = gst_element_factory_make("audioconvert","audioconvert");
+- PRIVATE(m)->output = gst_gconf_get_default_audio_sink();
++ PRIVATE(m)->output = gst_element_factory_make ("alsasink", "alsa-output");
+
+ PRIVATE(m)->current_music_path = g_strdup(path);
+
+- g_signal_connect(G_OBJECT(PRIVATE(m)->main_bin),
+- "error", GTK_SIGNAL_FUNC(error_handler),NULL);
+-
+- g_signal_connect( PRIVATE(m)->oggdemux, "new-pad", G_CALLBACK(oggdemux_new_pad),m);
+-
+- gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
+- PRIVATE(m)->filesrc,
+- PRIVATE(m)->oggdemux,
+- NULL);
+-
+ g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "location",path,NULL);
+
+- g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
+-
+- g_signal_connect(PRIVATE(m)->filesrc,
+- "eos",
+- G_CALLBACK(eos),
+- m);
+-
+- gst_element_link_many( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux,NULL);
+-
++// g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
++ gst_bus_add_watch (gst_pipeline_get_bus (
++ GST_PIPELINE (PRIVATE(m)->main_bin)),
++ bus_call, m);
++
++ gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
++ PRIVATE(m)->filesrc,
++ PRIVATE(m)->oggdemux,
++ PRIVATE(m)->vorbis_dec,
++ PRIVATE(m)->audioconvert,
++ PRIVATE(m)->output,
++ NULL);
++
++
++ gst_element_link( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux );
++ gst_element_link_many(
++ PRIVATE(m)->vorbis_dec,
++ PRIVATE(m)->audioconvert,
++ PRIVATE(m)->output,
++ NULL);
++ g_signal_connect( PRIVATE(m)->oggdemux, "pad-added",
++ G_CALLBACK(oggdemux_new_pad), m);
+
+ gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_PLAYING);
+-
+- PRIVATE(m)->is_playing = TRUE;
+-
+- while( !PRIVATE(m)->new_pad_ok && gst_bin_iterate( GST_BIN( PRIVATE(m)->main_bin)) && PRIVATE(m)->is_playing );
+-
+- PRIVATE(m)->loop_thread =
+- g_thread_create( loop,m,TRUE,NULL);
+-
+ }
+ }
+
+@@ -271,7 +220,7 @@
+
+ g_assert(IS_SOUND_MANAGER(m));
+
+- if( PRIVATE(m)->is_playing == TRUE) {
++ if( PRIVATE(m)->main_bin) {
+ stop_play(m);
+ }
+
+--- monkey-bubble-0.3.2/configure.gstreamer 2004-07-02 09:07:24.000000000 +0200
++++ monkey-bubble-0.3.2/configure 2006-04-30 22:06:54.000000000 +0200
+@@ -20454,21 +20454,18 @@
+ echo "$as_me:$LINENO: checking for
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ " >&5
+ echo $ECHO_N "checking for
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ ... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ " ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+@@ -20479,8 +20476,7 @@
+ LIBMONKEYAUDIO_A_CFLAGS=`$PKG_CONFIG --cflags "
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ "`
+ echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_CFLAGS" >&5
+ echo "${ECHO_T}$LIBMONKEYAUDIO_A_CFLAGS" >&6
+@@ -20490,8 +20486,7 @@
+ LIBMONKEYAUDIO_A_LIBS=`$PKG_CONFIG --libs "
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ "`
+ echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_LIBS" >&5
+ echo "${ECHO_T}$LIBMONKEYAUDIO_A_LIBS" >&6
+@@ -20503,8 +20498,7 @@
+ LIBMONKEYAUDIO_A_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ "`
+ echo $LIBMONKEYAUDIO_A_PKG_ERRORS
+ fi
+@@ -20523,14 +20517,12 @@
+ { { echo "$as_me:$LINENO: error: Library requirements (
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+ echo "$as_me: error: Library requirements (
+ gtk+-2.0
+ gthread-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -20731,8 +20723,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ " >&5
+@@ -20741,8 +20732,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ ... $ECHO_C" >&6
+@@ -20752,8 +20742,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ " ; then
+@@ -20768,8 +20757,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ "`
+@@ -20783,8 +20771,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ "`
+@@ -20800,8 +20787,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ "`
+@@ -20824,8 +20810,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+@@ -20834,8 +20819,7 @@
+ gthread-2.0
+ librsvg-2.0
+ libgnomeui-2.0
+- gstreamer-0.8
+- gstreamer-gconf-0.8
++ gstreamer-0.10
+ gconf-2.0
+ libglade-2.0
+ ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2 Aug 2006 21:34:46 -0000 1.4
+++ .cvsignore 3 Aug 2006 06:31:12 -0000 1.5
@@ -1 +1 @@
-monkey-bubble-0.4.0.tar.gz
+monkey-bubble-0.3.2.tar.gz
Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/monkey-bubble.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monkey-bubble.spec 2 Aug 2006 21:34:46 -0000 1.6
+++ monkey-bubble.spec 3 Aug 2006 06:31:12 -0000 1.7
@@ -1,14 +1,16 @@
Name: monkey-bubble
-Version: 0.4.0
+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 scrollkeeper gnome-doc-utils
+BuildRequires: desktop-file-utils scrollkeeper
Requires(pre): GConf2
Requires(post): GConf2 scrollkeeper
Requires(preun): GConf2
@@ -22,6 +24,8 @@
%prep
%setup -q
+%patch0 -p1 -z .gstreamer
+%patch1 -p1 -z .fixes
%{__sed} -i s/monkey-bubble-icon/monkey-bubble/ %{name}.desktop.in
@@ -37,9 +41,6 @@
make install DESTDIR=${RPM_BUILD_ROOT}
%find_lang %{name}
-#remove scrollkeeper stuff
-rm -rf $RPM_BUILD_ROOT/var
-
# below is the desktop file and icon stuff.
desktop-file-install --vendor fedora --delete-original \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -103,10 +104,6 @@
%changelog
-* Wed Aug 2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.0-1
-- New upstream version 0.4.0
-- Drop upstreamed patches
-
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 2 Aug 2006 21:34:46 -0000 1.4
+++ sources 3 Aug 2006 06:31:12 -0000 1.5
@@ -1 +1 @@
-0de8a05c8c15e08326d244534dc30f22 monkey-bubble-0.4.0.tar.gz
+37e91fa4cdbab9ec06b2ee2a5aa0683c monkey-bubble-0.3.2.tar.gz
- Previous message: rpms/torque/FC-3 torque-2.1.2-pam-getpwnam.patch, NONE, 1.1 torque.spec, 1.8, 1.9
- Next message: rpms/sylpheed-claws-plugins/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sylpheed-claws-plugins.spec, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list