Author: mtasaka Update of /cvs/free/rpms/cairo-dock/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv11568 Modified Files: .cvsignore cairo-dock.spec sources Added Files: cairo-dock-rev1816-dnd2share.patch Log Message: * Sun Jun 14 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - rev 1816 cairo-dock-rev1816-dnd2share.patch: --- NEW FILE cairo-dock-rev1816-dnd2share.patch --- Index: plug-ins/dnd2share/src/applet-backend-imagebin.h =================================================================== --- plug-ins/dnd2share/src/applet-backend-imagebin.h (revision 1816) +++ plug-ins/dnd2share/src/applet-backend-imagebin.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __CD_BACKEND_UPPIX__ -#define __CD_BACKEND_UPPIX__ +#ifndef __CD_BACKEND_IMAGEBIN__ +#define __CD_BACKEND_IMAGEBIN__ #include <cairo-dock.h> #include "applet-struct.h" Index: plug-ins/dnd2share/src/applet-backend-imagebin.c =================================================================== --- plug-ins/dnd2share/src/applet-backend-imagebin.c (revision 1816) +++ plug-ins/dnd2share/src/applet-backend-imagebin.c (working copy) @@ -31,7 +31,7 @@ { // on remplace les espaces du texte par des %20. gchar **cTextParts = g_strsplit (cFilePath, " ", -1); - GString *sContent = g_string_new_sized (strlen (cFilePath) + 300); // 100 espaces d'avance. + GString *sContent = g_string_sized_new (strlen (cFilePath) + 300); // 100 espaces d'avance. int i; for (i = 0; cTextParts[i] != NULL; i ++) { Index: plug-ins/dnd2share/src/applet-init.c =================================================================== --- plug-ins/dnd2share/src/applet-init.c (revision 1816) +++ plug-ins/dnd2share/src/applet-init.c (working copy) @@ -16,6 +16,7 @@ #include "applet-dnd2share.h" #include "applet-backend-uppix.h" #include "applet-init.h" +#include "applet-backend-imagebin.h" CD_APPLET_DEFINITION ("dnd2share", Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 10 Jun 2009 17:35:07 -0000 1.18 +++ .cvsignore 13 Jun 2009 16:36:39 -0000 1.19 @@ -1,2 +1 @@ -cairo-dock-2.0.5.tar.bz2 -cairo-dock-plugins-2.0.5.tar.bz2 +cairo-dock-sources-svn1816_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- cairo-dock.spec 10 Jun 2009 17:35:08 -0000 1.25 +++ cairo-dock.spec 13 Jun 2009 16:36:39 -0000 1.26 @@ -6,20 +6,20 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%global released 1 +%global released 0 %undefine pre_release # Set the below to 1 when building unstable plug-ins %global build_other 1 %global mainver 2.0.5 -%undefine betaver +%define betaver svn1816_trunk %global build_themes 0 %global build_webkit 1 %global build_xfce 1 -%global fedora_main_rel 1 +%global fedora_main_rel 2 %global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver} @@ -54,6 +54,7 @@ # plug-ins specific patches Patch100: cairo-dock-rev1677-stacks.patch +Patch101: cairo-dock-rev1816-dnd2share.patch %if ! %{released} BuildRequires: automake @@ -250,6 +251,9 @@ \( -not -path '*/.svn/*' -and -not -name \*.png \) \ | xargs %{__sed} -i -e 's|\r||' +# dnd2share +%patch101 -p1 -b .compile2 + # stacks: directory fix %if 0%{?released} < 1 %patch100 -p0 -b .compile @@ -630,6 +634,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun Jun 14 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; +- rev 1816 + * Thu Jun 11 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - 2.0.5-1 - 2.0.5 Index: sources =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 10 Jun 2009 17:35:08 -0000 1.20 +++ sources 13 Jun 2009 16:36:40 -0000 1.21 @@ -1,2 +1 @@ -17863320a80d96bfebf248bd0fc10ce2 cairo-dock-2.0.5.tar.bz2 -1409c80cf5a02fbe28c1dc49c187d1e7 cairo-dock-plugins-2.0.5.tar.bz2 +bb13f667da08d568a03097f8a26c4540 cairo-dock-sources-svn1816_trunk.tar.bz2