rpms/synce-hal/devel synce-hal-sock.patch, NONE, 1.1 synce-hal.spec, 1.7, 1.8

[Andreas Bierfert]

Author: awjb

Update of /cvs/pkgs/rpms/synce-hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23425

Modified Files:
	synce-hal.spec 
Added Files:
	synce-hal-sock.patch 
Log Message:
- fix sock location


synce-hal-sock.patch:
 Makefile.am               |    3 ++-
 Makefile.in               |    4 +++-
 synce-connection-broker.c |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE synce-hal-sock.patch ---
diff -Nurp hal.orig/src/Makefile.am hal/src/Makefile.am
--- hal.orig/src/Makefile.am	2009-02-06 18:41:55.000000000 +0000
+++ hal/src/Makefile.am	2009-08-01 11:28:00.000000000 +0100
@@ -1,4 +1,5 @@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall \
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"
 
 libexec_PROGRAMS = hal-dccm synce-serial-chat
 
diff -Nurp hal.orig/src/Makefile.in hal/src/Makefile.in
--- hal.orig/src/Makefile.in	2009-08-01 11:30:09.000000000 +0100
+++ hal/src/Makefile.in	2009-08-01 11:28:42.000000000 +0100
@@ -211,7 +211,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall \
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"
+
 BUILT_SOURCES = synce-device-signals-marshal.h \
 		synce-device-signals-marshal.c \
 		synce-device-glue.h
diff -Nurp hal.orig/src/synce-connection-broker.c hal/src/synce-connection-broker.c
--- hal.orig/src/synce-connection-broker.c	2008-10-28 11:23:00.000000000 +0000
+++ hal/src/synce-connection-broker.c	2009-08-01 11:28:00.000000000 +0100
@@ -236,7 +236,7 @@ _synce_connection_broker_take_connection
   priv->conn = conn;
 
   rnd = g_rand_new ();
-  priv->filename = g_strdup_printf ("/tmp/synce-%08x%08x%08x%08x.sock",
+  priv->filename = g_strdup_printf ("%s/run/synce-%08x%08x%08x%08x.sock", LOCALSTATEDIR,
       g_rand_int (rnd), g_rand_int (rnd), g_rand_int (rnd), g_rand_int (rnd));
   g_rand_free (rnd);


Index: synce-hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-hal/devel/synce-hal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- synce-hal.spec	27 Jul 2009 05:16:24 -0000	1.7
+++ synce-hal.spec	3 Aug 2009 18:30:34 -0000	1.8
@@ -1,12 +1,14 @@
 Name:           synce-hal
 Version:        0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Connection framework and dccm-implementation
 
 Group:          Applications/Communications
 License:        GPLv2
 URL:            http://www.synce.org
 Source0:        http://downloads.sourceforge.net/synce/%{name}-%{version}.tar.gz
+# see #514768 create sockets in /var/run instead of /tmp
+Patch0:         synce-hal-sock.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsynce-devel
@@ -26,6 +28,7 @@ for Windows Mobile devices that integrat
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-bluetooth-support --with-hal-addon-dir=%{_libexecdir}