rpms/cairo-dock/devel cairo-dock-rev1677-stacks.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cairo-dock.spec, 1.2, 1.3 sources, 1.2, 1.3

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore cairo-dock.spec sources 
Added Files:
	cairo-dock-rev1677-stacks.patch 
Log Message:
* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1677


cairo-dock-rev1677-stacks.patch:

--- NEW FILE cairo-dock-rev1677-stacks.patch ---
Index: stacks/src/applet-load-icons.c
===================================================================
--- stacks/src/applet-load-icons.c	(revision 1677)
+++ stacks/src/applet-load-icons.c	(working copy)
@@ -193,7 +193,7 @@
 		if (g_list_length (pStacksIconList) == 1)  //Sinon on a pas l'icône qui saute joyeusement.
 			CD_APPLET_CREATE_MY_SUBDOCK (pStacksIconList, myConfig.cRenderer);
 			
-		cairo_dock_insert_icon_in_dock (pAddedIcon, myIcon->pSubDock, ! CAIRO_DOCK_UPDATE_DOCK_SIZE, ! CAIRO_DOCK_ANIMATE_ICON, CAIRO_DOCK_APPLY_RATIO, FALSE);
+		cairo_dock_insert_icon_in_dock (pAddedIcon, myIcon->pSubDock, ! CAIRO_DOCK_UPDATE_DOCK_SIZE, ! CAIRO_DOCK_ANIMATE_ICON);
 		cairo_dock_update_dock_size (myIcon->pSubDock);
 	}
 	else


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Apr 2009 18:38:20 -0000	1.2
+++ .cvsignore	22 Apr 2009 20:00:39 -0000	1.3
@@ -1,3 +1 @@
-cairo-dock-2.0.0-rc3.tar.bz2
-cairo-dock-plugins-2.0.0-rc3-modified.tar.bz2
-cairo-dock-2.0.0-rc3-missing-files.tar.bz2
+cairo-dock-sources-svn1677_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cairo-dock.spec	21 Apr 2009 18:40:23 -0000	1.2
+++ cairo-dock.spec	22 Apr 2009 20:00:39 -0000	1.3
@@ -6,24 +6,24 @@
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-%global		released	1
+%global		released	0
 # Set the below to 1 when building unstable plug-ins
 %global		build_other	1
 
 %global		mainver		2.0.0
 %global		betaver		rc3
-%global		tarballver		svn1527_trunk
+%global		tarballver		svn1677_trunk
 
 %global		build_webkit	1
 %global		build_xfce	1
 
-%global		fedora_main_rel	0.4
+%global		fedora_main_rel	5
 
 
 %if 0%{?released} < 1
 %global		fedora_rel	0.%{fedora_main_rel}.%{tarballver}
 %else
-%global		fedora_rel	%{fedora_main_rel}%{?betaver:.%betaver}
+%global		fedora_rel	%{?betaver:0.}%{fedora_main_rel}%{?betaver:.%betaver}
 %endif
 
 %if 0%{?released} >= 1
@@ -57,10 +57,11 @@
 #Source2:	http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source2:	%{name}-plugins-%{mainver}%{?betaver:-%betaver}-modified.tar.bz2
 %endif
-# Very temporary, brought from svn trun rev. 1667
-Source100:	cairo-dock-2.0.0-rc3-missing-files.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# plug-ins specific patches
+Patch100:	cairo-dock-rev1677-stacks.patch
+
 %if ! %{released}
 BuildRequires:	automake
 BuildRequires:	intltool
@@ -183,8 +184,9 @@
 ###
 %if %{build_themes}
 %setup -q -c -a 1 -a 2
+%else
+%setup -q -c -a 2
 %endif
-%setup -q -c -a 2 -a 100
 %{__ln_s} -f cairo-dock-%{mainver}%{?betaver:-%betaver} cairo-dock
 %if %{build_themes}
 %{__ln_s} -f cairo-dock-themes-%{mainver}%{?betaver:-%betaver} themes
@@ -193,10 +195,6 @@
 %endif
 ###
 
-## Temporary
-##
-%{__cp} -a trunk/plug-ins/MISSING_FILES/* plug-ins/
-
 %if 0
 find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
 find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
@@ -293,6 +291,7 @@
 # mail: license conflict now resolved
 
 # stacks: directory fix
+%patch100 -p0 -b .compile
 %if 0%{?released} < 1
 %{__sed} -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
 	stacks/configure.ac
@@ -312,16 +311,6 @@
 done
 %endif
 
-# rhythmbox
-pushd rhythmbox/data/themes
-%{__sed} -i -e '/ipod/d' \
-%if 0%{?released}
-	Makefile.in
-%else
-	Makefile.am
-%endif
-popd
-
 # template: upstream says this is not needed
 %{__rm} -rf template/
 
@@ -452,8 +441,8 @@
 	%configure $CONFIGURE_OPTS
 	# Parallel make fails some times, but it is gerenally fast
 	# so do parallel make anyway first
-	%{__make} %{?_smp_mflags} -k || :
-	%{__make} -k || status=$((status+1))
+	%{__make} %{?_smp_mflags} || :
+	%{__make} || status=$((status+1))
 
 	cd ..
 done
@@ -689,6 +678,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1677
+
 * Sat Apr 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.4.rc3
 - 2.0.0 rc3
 - Move to rpmfusion


Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Apr 2009 18:38:20 -0000	1.2
+++ sources	22 Apr 2009 20:00:39 -0000	1.3
@@ -1,3 +1 @@
-e2c9aa78fb96bb0b6330f707cea5bad4  cairo-dock-2.0.0-rc3.tar.bz2
-d59b00692f7ed5428d1c511474915b19  cairo-dock-plugins-2.0.0-rc3-modified.tar.bz2
-661f7cc29662986d2bdf5521ed899585  cairo-dock-2.0.0-rc3-missing-files.tar.bz2
+144ac32234802a18ea7481d5369bd15e  cairo-dock-sources-svn1677_trunk.tar.bz2