From bb66b756a9e6243447c937a29ea970970568f544 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Aug 14 2008 03:51:32 +0000
Subject: - rev. 1248


---

diff --git a/.cvsignore b/.cvsignore
index 0059ebb..add36ef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cairo-dock-sources-svn1241_trunk.tar.bz2
+cairo-dock-sources-svn1248_trunk.tar.bz2
diff --git a/cairo-dock-svn1248-suppress-debug-message.patch b/cairo-dock-svn1248-suppress-debug-message.patch
new file mode 100644
index 0000000..0db5f81
--- /dev/null
+++ b/cairo-dock-svn1248-suppress-debug-message.patch
@@ -0,0 +1,14 @@
+Index: src/cairo-dock-applet-facility.c
+===================================================================
+--- src/cairo-dock-applet-facility.c	(revision 1248)
++++ src/cairo-dock-applet-facility.c	(working copy)
+@@ -375,7 +375,8 @@
+ 	g_return_if_fail (pMeasureTimer != NULL);
+ 	if (pMeasureTimer->pMutexData == NULL)
+ 	{
+-		g_print ("mutex nul\n");
++		// for now shut up this debug message
++		// g_print ("mutex nul\n");
+ 		if (pMeasureTimer->acquisition != NULL)
+ 			pMeasureTimer->acquisition (pMeasureTimer->pUserData);
+ 		if (pMeasureTimer->read != NULL)
diff --git a/cairo-dock.spec b/cairo-dock.spec
index bd87037..f4c0262 100644
--- a/cairo-dock.spec
+++ b/cairo-dock.spec
@@ -7,7 +7,7 @@
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1241_trunk
+%define		tarballver	svn1248_trunk
 %define		mainver		1.6.2
 %define		build_gecko	1
 
@@ -50,7 +50,7 @@ Source0:	http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar
 %endif
 #Patch0:		cairo-dock-rev1235-inf-loop.patch
 Patch1:		cairo-dock-plugin-rev1241.diff
-Patch2:		cairo-dock-rev1241-plugin-base.diff
+Patch2:		cairo-dock-svn1248-suppress-debug-message.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -172,6 +172,7 @@ pushd .
 cd cairo-dock
 # temporary fix
 %{__sed} -i.inline -e 's|^inline ||' src/cairo-dock-icons.*
+%patch2 -p0 -b .suppress
 
 # permission
 for dir in */
@@ -209,7 +210,6 @@ cd ../plug-ins
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
 # source code fix
-%patch2 -p1 -b .base
 %patch1 -p1 -b .misc
 
 # mail: license conflict
@@ -605,8 +605,8 @@ popd # from $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Aug 13 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-- rev. 1241
+* Thu Aug 14 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- rev. 1248
 
 * Sun Aug 10 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.6.2-0.2.svn1235_trunk
 - Enable unstable plugins again
diff --git a/sources b/sources
index 05acab6..038d264 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cd841808a8cf8e64dff59e95286e5dd  cairo-dock-sources-svn1241_trunk.tar.bz2
+3174b4e5f397b8b70ccf004ddbe17dac  cairo-dock-sources-svn1248_trunk.tar.bz2