Author: mtasaka Update of /cvs/free/rpms/cairo-dock/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv2305 Modified Files: .cvsignore cairo-dock.spec sources Added Files: cairo-dock-rev1821-cairodock.patch Log Message: * Mon Jun 15 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - rev 1821 cairo-dock-rev1821-cairodock.patch: --- NEW FILE cairo-dock-rev1821-cairodock.patch --- Index: cairo-dock/src/cairo-dock-class-manager.c =================================================================== --- cairo-dock/src/cairo-dock-class-manager.c (revision 1821) +++ cairo-dock/src/cairo-dock-class-manager.c (working copy) @@ -27,6 +27,7 @@ #include "cairo-dock-internal-icons.h" #include "cairo-dock-container.h" #include "cairo-dock-class-manager.h" +#include "cairo-dock-dock-facility.h" extern CairoDock *g_pMainDock; extern gboolean g_bEasterEggs; Index: cairo-dock/src/cairo-dock-internal-labels.c =================================================================== --- cairo-dock/src/cairo-dock-internal-labels.c (revision 1821) +++ 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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 13 Jun 2009 16:36:39 -0000 1.19 +++ .cvsignore 15 Jun 2009 13:41:22 -0000 1.20 @@ -1 +1 @@ -cairo-dock-sources-svn1816_trunk.tar.bz2 +cairo-dock-sources-svn1821_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- cairo-dock.spec 13 Jun 2009 16:36:39 -0000 1.26 +++ cairo-dock.spec 15 Jun 2009 13:41:22 -0000 1.27 @@ -6,13 +6,17 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . +# Use -gdwarf-2 until /usr/lib/rpm/debugedit supports -gdwarf-3 (bug 505774) +%global optflags_ %optflags +%global optflags %optflags_ -gdwarf-2 + %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 -%define betaver svn1816_trunk +%define betaver svn1821_trunk %global build_themes 0 @@ -54,7 +58,7 @@ # plug-ins specific patches Patch100: cairo-dock-rev1677-stacks.patch -Patch101: cairo-dock-rev1816-dnd2share.patch +Patch101: cairo-dock-rev1821-cairodock.patch %if ! %{released} BuildRequires: automake @@ -204,6 +208,9 @@ # A. main cd cairo-dock +# Patch +%patch101 -p1 -b .compile + # permission for dir in */ do @@ -246,14 +253,14 @@ # 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 \) \ | xargs %{__sed} -i -e 's|\r||' -# dnd2share -%patch101 -p1 -b .compile2 - # stacks: directory fix %if 0%{?released} < 1 %patch100 -p0 -b .compile @@ -261,13 +268,6 @@ stacks/configure.ac %endif -# System-Monitor -%if 0%{?released} < 1 -%{__sed} -i.typo \ - -e 's|CPUSAGE|SYSTEM_MONITOR|' \ - System-Monitor/po/Makefile.in.in -%endif - # template: upstream says this is not needed %{__rm} -rf template/ @@ -569,6 +569,9 @@ popd # from $RPM_BUILD_ROOT +# ????? +rm -f %{buildroot}%{_libdir}/libcairo-dock.* + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -634,8 +637,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun Jun 14 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; -- rev 1816 +* Mon Jun 15 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; +- rev 1821 * 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.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 13 Jun 2009 16:36:40 -0000 1.21 +++ sources 15 Jun 2009 13:41:22 -0000 1.22 @@ -1 +1 @@ -bb13f667da08d568a03097f8a26c4540 cairo-dock-sources-svn1816_trunk.tar.bz2 +fbfb43e6f60ae8e2ec807205c8fa9e79 cairo-dock-sources-svn1821_trunk.tar.bz2