rpms/gammu/devel gammu-1.26.1-exec.patch, NONE, 1.1 gammu.spec, 1.33, 1.34

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18989

Modified Files:
	gammu.spec 
Added Files:
	gammu-1.26.1-exec.patch 
Log Message:
* Thu Jun 10 2010 Dan Horák <dan[at]danny.cz> - 1.26.1-2
- build without USB on s390(x)
- fixed FTBFS #555451


gammu-1.26.1-exec.patch:
 sms_cgi.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gammu-1.26.1-exec.patch ---
diff -up gammu-1.26.1/contrib/smscgi/sms_cgi.c.orig gammu-1.26.1/contrib/smscgi/sms_cgi.c
--- gammu-1.26.1/contrib/smscgi/sms_cgi.c.orig	2010-06-10 14:55:30.000000000 +0200
+++ gammu-1.26.1/contrib/smscgi/sms_cgi.c	2010-06-10 15:01:45.000000000 +0200
@@ -76,6 +76,7 @@ static void NORETURN cgi_child(GSM_State
 	int errfd;
 	char script_name[300];
 	const char*data;
+	char *empty_argv[1] = { NULL };
 	strcpy(script_name, cgi_path); /**<                     prepend script path */
 
 	/* ---------------------------------------------------- get the script name */
@@ -115,7 +116,7 @@ static void NORETURN cgi_child(GSM_State
 	smprintf(s, CGI_ENGINE "Executing > %s\n", script_name);
 
 	/* Execute script */
-	execv(script_name, NULL);
+	execv(script_name, empty_argv);
 
 	/* ------------------------------------------------------ failed to execute */
 	smprintf(s, CGI_ENGINE "Failed to execure %s : %s\n", script_name, strerror(errno));
@@ -140,7 +141,7 @@ static void NORETURN cgi_child(GSM_State
 	smprintf(s, CGI_ENGINE "Executing > %s\n", script_name);
 
 	/* Execute script */
-	execv(script_name, NULL);
+	execv(script_name, empty_argv);
 
 	error:
 	/* ------------------------------------------------------ failed to execute */


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gammu.spec	3 Dec 2009 19:20:13 -0000	1.33
+++ gammu.spec	10 Jun 2010 13:09:20 -0000	1.34
@@ -2,17 +2,21 @@
 
 Name:		gammu
 Version:        1.26.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://cihar.com/gammu/
 Source0:        ftp://dl.cihar.com/gammu/releases/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-1.26.1-exec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	autoconf, gettext, cmake
-BuildRequires:	libusb1-devel, doxygen
+%ifnarch s390 s390x
+BuildRequires:	libusb1-devel
+%endif
+BuildRequires:	doxygen
 BuildRequires:  libdbi-devel, libcurl-devel
 # Enabling bluetooth fonction
 BuildRequires:	bluez-libs-devel
@@ -70,6 +74,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1 -b .exec
 
 #sed -i 's|${INSTALL_LIB_DIR}|%{_libdir}|' CMakeLists.txt libgammu/CMakeLists.txt \
 #				smsd/CMakeLists.txt gammu/CMakeLists.txt
@@ -154,6 +159,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 10 2010 Dan Horák <dan[at]danny.cz> - 1.26.1-2
+- build without USB on s390(x)
+- fixed FTBFS #555451
+
 * Thu Dec 03 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.26.1-1
 - Update release.