rpms/cairo-dock/devel cairo-dock-rev1823-cairodock.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 cairo-dock.spec, 1.27, 1.28 sources, 1.22, 1.23

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22295

Modified Files:
	.cvsignore cairo-dock.spec sources 
Added Files:
	cairo-dock-rev1823-cairodock.patch 
Log Message:
rev 1823

cairo-dock-rev1823-cairodock.patch:

--- NEW FILE cairo-dock-rev1823-cairodock.patch ---
Index: cairo-dock/src/cairo-dock-internal-labels.c
===================================================================
--- cairo-dock/src/cairo-dock-internal-labels.c	(revision 1823)
+++ cairo-dock/src/cairo-dock-internal-labels.c	(working copy)
@@ -17,6 +17,7 @@
 #include "cairo-dock-internal-dialogs.h"
 #include "cairo-dock-internal-icons.h"
 #include "cairo-dock-container.h"
+#include "cairo-dock-dock-facility.h"
 #define _INTERNAL_MODULE_
 #include "cairo-dock-internal-labels.h"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	15 Jun 2009 13:41:22 -0000	1.20
+++ .cvsignore	16 Jun 2009 18:27:08 -0000	1.21
@@ -1 +1 @@
-cairo-dock-sources-svn1821_trunk.tar.bz2
+cairo-dock-sources-svn1823_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cairo-dock.spec	15 Jun 2009 13:41:22 -0000	1.27
+++ cairo-dock.spec	16 Jun 2009 18:27:08 -0000	1.28
@@ -16,7 +16,7 @@
 %global		build_other	1
 
 %global		mainver		2.0.5
-%define		betaver		svn1821_trunk
+%define		betaver		svn1823_trunk
 
 %global		build_themes	0
 
@@ -58,7 +58,7 @@
 
 # plug-ins specific patches
 Patch100:	cairo-dock-rev1677-stacks.patch
-Patch101:	cairo-dock-rev1821-cairodock.patch
+Patch101:	cairo-dock-rev1823-cairodock.patch
 
 %if ! %{released}
 BuildRequires:	automake
@@ -253,9 +253,6 @@
 
 # source code fix
 
-# System-monitor
-%{__cp} -p nVidia/data/nvidia-config System-Monitor/data/
-
 # dialog-rendering
 find dialog-rendering -type f \
 	\( -not -path '*/.svn/*' -and -not -name \*.png \) \
@@ -569,7 +566,7 @@
 
 popd # from $RPM_BUILD_ROOT
 
-# ?????
+# For now these are not needed
 rm -f %{buildroot}%{_libdir}/libcairo-dock.*
 
 %clean
@@ -637,8 +634,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Jun 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1821
+* Wed Jun 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1823
 
 * Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.5-1
 - 2.0.5


Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	15 Jun 2009 13:41:22 -0000	1.22
+++ sources	16 Jun 2009 18:27:08 -0000	1.23
@@ -1 +1 @@
-fbfb43e6f60ae8e2ec807205c8fa9e79  cairo-dock-sources-svn1821_trunk.tar.bz2
+71ec0a4b6a0ba9ccc4a0be928449c185  cairo-dock-sources-svn1823_trunk.tar.bz2