rpms/cairo-dock/devel .cvsignore, 1.27, 1.28 cairo-dock-fix-insecure-tmpfile.patch, 1.2, 1.3 cairo-dock.spec, 1.37, 1.38 sources, 1.27, 1.28

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8188

Modified Files:
	.cvsignore cairo-dock-fix-insecure-tmpfile.patch 
	cairo-dock.spec sources 
Log Message:
* Sat Jun 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- svn 1020 (prepare for 1.6.0.2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	19 Jun 2008 04:11:36 -0000	1.27
+++ .cvsignore	21 Jun 2008 04:11:59 -0000	1.28
@@ -1 +1 @@
-cairo-dock-sources-20080619.tar.bz2
+cairo-dock-sources-svn1120_trunk.tar.bz2

cairo-dock-fix-insecure-tmpfile.patch:

Index: cairo-dock-fix-insecure-tmpfile.patch
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock-fix-insecure-tmpfile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cairo-dock-fix-insecure-tmpfile.patch	15 Jun 2008 13:02:44 -0000	1.2
+++ cairo-dock-fix-insecure-tmpfile.patch	21 Jun 2008 04:11:59 -0000	1.3
@@ -1,61 +1,10 @@
---- trunk/plug-ins/compiz-icon/src/applet-notifications.c.tmpuse	2008-06-15 02:04:01.000000000 +0900
-+++ trunk/plug-ins/compiz-icon/src/applet-notifications.c	2008-06-15 20:51:54.000000000 +0900
-@@ -8,6 +8,8 @@
- 
- ******************************************************************************/
- 
-+#define _BSD_SOURCE
-+#include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
- #include <glib/gi18n.h>
-@@ -23,13 +25,26 @@
- CD_APPLET_ABOUT (D_("This is the compiz-icon applet\n made by ChAnGFu for Cairo-Dock"))
- 
- static void _compiz_get_version (void) {
-+	char *tmpfile = g_strdup("/tmp/cd-compiz-version.XXXXXX");
-+	char *cmd_header = "compiz.real --version | awk '{print $2}' > ";
-+	char *cmd = g_malloc(strlen(cmd_header) + strlen(tmpfile) + 2);
-+	int fds = mkstemp(tmpfile);
-+	if (fds == -1) {
-+		free (tmpfile);
-+		free (cmd);
-+		return;
-+	}
-+	close(fds);
-+
- 	if (myData.iCompizMajor != 0 || myData.iCompizMinor != 0 || myData.iCompizMicro != 0)
- 		return ;
--	system ("compiz.real --version | awk '{print $2}' > /tmp/cd-compiz-version");
-+	sprintf(cmd, "%s%s", cmd_header, tmpfile);
-+	system (cmd);
-+	g_free (cmd);
- 	GError *erreur = NULL;
- 	gsize length = 0;
- 	gchar *cContent = NULL;
--	g_file_get_contents ("/tmp/cd-compiz-version", &cContent, &length, &erreur);
-+	g_file_get_contents (tmpfile, &cContent, &length, &erreur);
- 	if (erreur != NULL) {
- 		cd_warning ("Attention : couldn't guess Compiz's version [%s]", erreur->message);
- 		g_error_free (erreur);
-@@ -40,7 +55,9 @@
- 		g_free (cContent);
+--- ./plug-ins/compiz-icon/src/applet-notifications.c.tmpuse	2008-06-21 10:12:26.000000000 +0900
++++ ./plug-ins/compiz-icon/src/applet-notifications.c	2008-06-21 12:18:54.000000000 +0900
+@@ -35,6 +35,7 @@
+ 		g_free (cTmpFile);
+ 		return;
  	}
- 	cd_message ("Compiz : %d.%d.%d", myData.iCompizMajor, myData.iCompizMinor, myData.iCompizMicro);
--	g_remove ("/tmp/cd-compiz-version");
-+	g_remove (tmpfile);
-+	g_free (tmpfile);
-+	tmpfile = NULL;
- }
- 
- static void _compiz_dbus_action (const gchar *cCommand) {
---- trunk/plug-ins/nVidia/src/applet-nvidia.c.tmpuse	2008-06-15 12:37:12.000000000 +0900
-+++ trunk/plug-ins/nVidia/src/applet-nvidia.c	2008-06-15 21:15:21.000000000 +0900
-@@ -100,6 +100,7 @@
- 	gchar *cCommand = g_strdup_printf ("bash %s/nvidia-config %s", MY_APPLET_SHARE_DATA_DIR, s_cTmpFileConfig);
++	close(fds);
+ 	gchar *cCommand = g_strdup_printf ("compiz.real --version | awk '{print $2}' > %s", cTmpFile);
  	system (cCommand);
  	g_free (cCommand);
-+	close(fds);
- }
- 
- static gboolean _nvidia_get_values_from_file (gchar *cContent) {


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cairo-dock.spec	19 Jun 2008 19:10:28 -0000	1.37
+++ cairo-dock.spec	21 Jun 2008 04:11:59 -0000	1.38
@@ -1,15 +1,14 @@
 # For svn
 # svn checkout http://svn.berlios.de/svnroot/repos/cairo-dock/trunk
-# mkdir -p opt/cairo-dock
-# mv trunk opt/cairo-dock
-# tar cjf cairo-dock-sources-%%{tag}.tar.bz2 opt/
+# cd trunk
+# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-%define		tarballver	20080619
-%define		mainver		1.6.0.1
+%define		tarballver	svn1120_trunk
+%define		mainver		1.6.0.2
 %define		build_gecko	1
 
 
-%define		fedora_rel	2.date%{tarballver}
+%define		fedora_rel	0.1.%{tarballver}
 
 
 %if 0%{?fedora} >= 9
@@ -133,7 +132,6 @@
 find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
 find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
 
-#pushd opt/cairo-dock/trunk/cairo-dock
 pushd .
 %patch0 -p1 -b .tmpuse
 %patch1 -p0 -b .rootwin -R
@@ -195,16 +193,8 @@
 %endif
 
 # temporary fix
-## AC_SUBST fix
-%{__sed} -i.acdebug \
-	-e 's|\(AC_SUBST([^ ,][^ ,]*\) |\1, |'\
-	configure.ac
 
 # First deal with subdirs in topdir configure.ac, then else
-%{__sed} -i.typo \
-	-e 's|^xfce_dir=.*$|xfce_dir=xfce-integration|' \
-	Makefile.am
-
 Subdirs_1=$(%{__sed} -n '\@SUBDIR@,\@^.*[^\\]$@s|\\$||p' Makefile.am | tail -n +2)
 %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh
 
@@ -254,7 +244,6 @@
 status=0
 
 # A. main
-#pushd opt/cairo-dock/trunk/cairo-dock
 pushd cairo-dock
 
 %configure
@@ -314,7 +303,6 @@
 TOPDIR=$(pwd)
 
 # A. main
-#pushd opt/cairo-dock/trunk/cairo-dock
 pushd cairo-dock
 export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
 
@@ -506,6 +494,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Jun 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- svn 1020 (prepare for 1.6.0.2)
+
 * Fri Jun 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.1-2.date20080619
 - Revert XCompositeRedirectSubwindows() part in 
   cairo-dock-X-utilities.c


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	19 Jun 2008 04:11:36 -0000	1.27
+++ sources	21 Jun 2008 04:11:59 -0000	1.28
@@ -1 +1 @@
-fcf4f8f660a72fbbcd3eafe3144c7b9d  cairo-dock-sources-20080619.tar.bz2
+e0b01ef1c18fc5728919b39a5a0ab2d0  cairo-dock-sources-svn1120_trunk.tar.bz2