rpms/denemo/devel denemo-binreloc.patch, NONE, 1.1 denemo-block_debug.patch, NONE, 1.1 denemo-undo-assert.patch, NONE, 1.1 denemo.spec, 1.1, 1.2

[Roy Rankin]

Author: rrankin

Update of /cvs/pkgs/rpms/denemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18168

Modified Files:
	denemo.spec 
Added Files:
	denemo-binreloc.patch denemo-block_debug.patch 
	denemo-undo-assert.patch 
Log Message:
Patches fior assert undo crash, un-needed messages on start up


denemo-binreloc.patch:

--- NEW FILE denemo-binreloc.patch ---
diff --git a/src/utils.c b/src/utils.c
index b0751ed..49b5cea 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -509,6 +509,7 @@ void
 initdir ()
 {
 #ifndef G_OS_WIN32
+#ifdef ENABLE_BINRELOC
   GError *error=NULL;
   if(!gbr_init (&error))
     {
@@ -521,6 +522,7 @@ initdir ()
       g_error_free (error);
       g_print ("----------------\n");
     }
+#endif /* ENABLE_BINRELOC */
 #endif /* not G_OS_WIN32 */
 }
 

denemo-block_debug.patch:

--- NEW FILE denemo-block_debug.patch ---
diff --git a/src/prefops.c b/src/prefops.c
index df24107..c7048b1 100644
--- a/src/prefops.c
+++ b/src/prefops.c
@@ -368,7 +368,9 @@ parseConfig (xmlDocPtr doc, xmlNodePtr cur, DenemoPrefs * prefs)
 static void
 writeHistoryEntry (gpointer data, gpointer user_data)
 {
+#ifdef DEBUG
   g_print ("filename %s\n", (gchar *) data);
+#endif
   xmlNewTextChild ((xmlNodePtr) user_data, NULL, (xmlChar *) "file",
 		   (xmlChar *) data);
 }

denemo-undo-assert.patch:

--- NEW FILE denemo-undo-assert.patch ---
diff --git a/src/selectops.c b/src/selectops.c
index b281c23..d53f2e6 100644
--- a/src/selectops.c
+++ b/src/selectops.c
@@ -53,7 +53,9 @@ setcurrentobject (DenemoScore * si, gint cursorpos)
 
   si->currentobject = g_list_nth ((objnode *) si->currentmeasure->data,
 				  cursorpos);
+#ifdef DEBUG
   g_assert (si->currentobject != NULL);
+#endif /* DEBUG */
 }
 
 /**


Index: denemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/denemo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- denemo.spec	24 Aug 2008 23:05:19 -0000	1.1
+++ denemo.spec	3 Sep 2008 11:16:14 -0000	1.2
@@ -1,10 +1,14 @@
 Summary: Graphical music notation program
 Name: denemo
 Version: 0.7.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://download.savannah.gnu.org/releases/denemo/%{name}-%{version}.tar.gz
+Patch0: %{name}-block_debug.patch
+Patch1: %{name}-undo-assert.patch
+Patch2: %{name}-binreloc.patch
+
 URL: http://www.denemo.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +28,9 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure 
@@ -52,6 +59,8 @@
 %doc COPYING README README.lilypond ChangeLog 
 
 %changelog
+* Wed Sep 03 2008 Roy Rankin <rrankin at ihug.com.au> - 0.7.9-5
+-Add Patches assert undo crash, un-needed messages on start up
 * Mon Aug 18 2008 Roy Rankin <rrankin at ihug.com.au> 0.7.9-4
 -Simplify Requires
 * Sat Aug 16 2008 Roy Rankin <rrankin at ihug.com.au> 0.7.9-3