rpms/lineakd/devel lineakd-0.9-gcc43.patch, NONE, 1.1 lineakd.spec, 1.8, 1.9

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/lineakd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29332/devel

Modified Files:
	lineakd.spec 
Added Files:
	lineakd-0.9-gcc43.patch 
Log Message:
fix license, fix compile with gcc43

lineakd-0.9-gcc43.patch:

--- NEW FILE lineakd-0.9-gcc43.patch ---
diff -up lineakd-0.9/lineak/ldef.h.BAD lineakd-0.9/lineak/ldef.h
--- lineakd-0.9/lineak/ldef.h.BAD	2008-06-06 12:13:32.000000000 -0500
+++ lineakd-0.9/lineak/ldef.h	2008-06-06 12:13:39.000000000 -0500
@@ -20,6 +20,7 @@
 
 #include <string>
 #include <map>
+#include <cstdlib>
 
 #include <lineak/definitions.h>
 #include <lineak/lkbd.h>
diff -up lineakd-0.9/lineak/lineak_core_functions.h.BAD lineakd-0.9/lineak/lineak_core_functions.h
--- lineakd-0.9/lineak/lineak_core_functions.h.BAD	2008-06-06 12:02:00.000000000 -0500
+++ lineakd-0.9/lineak/lineak_core_functions.h	2008-06-06 12:21:28.000000000 -0500
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <string>
+#include <cstring>
 #include <lineak/lobject.h>
 #include <lineak/definitions.h>
 
diff -up lineakd-0.9/lineak/xmgr.cpp.BAD lineakd-0.9/lineak/xmgr.cpp
diff -up lineakd-0.9/lineak/xmgr.h.BAD lineakd-0.9/lineak/xmgr.h
--- lineakd-0.9/lineak/xmgr.h.BAD	2008-06-06 12:06:22.000000000 -0500
+++ lineakd-0.9/lineak/xmgr.h	2008-06-06 12:10:27.000000000 -0500
@@ -26,7 +26,7 @@
 #endif
 
 extern "C" {
-#include <stdio.h>
+#include <cstdlib>
 //#include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>


Index: lineakd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lineakd/devel/lineakd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lineakd.spec	20 Feb 2008 08:23:40 -0000	1.8
+++ lineakd.spec	6 Jun 2008 18:01:45 -0000	1.9
@@ -4,17 +4,18 @@
 
 Name:           lineakd
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Linux support for Easy Access and Multimedia keyboards
 
 Group:          User Interface/Desktops
-License:        GPL
+License:        GPLv2+
 URL:            http://lineak.sourceforge.net
 
 ################################################################################
 
 Source:         http://dl.sourceforge.net/lineak/%{name}-%{version}.tar.gz
-Patch:          install_dirs.patch
+Patch0:         install_dirs.patch
+Patch1:         lineakd-0.9-gcc43.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,9 +26,6 @@
 BuildRequires:      libXt-devel
 BuildRequires:      libXtst-devel
 
-Requires(post):     /sbin/ldconfig
-Requires(postun):   /sbin/ldconfig
-
 ################################################################################
 
 %description
@@ -54,7 +52,8 @@
 %prep
 
 %setup -q
-%patch
+%patch0
+%patch1 -p1
 
 ################################################################################
 
@@ -80,22 +79,11 @@
 ################################################################################
 
 %clean
-
 rm -rf $RPM_BUILD_ROOT
 
-################################################################################
-
-%post
-
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-################################################################################
-
-%postun
-
-/sbin/ldconfig
-
-################################################################################
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -120,6 +108,10 @@
 ################################################################################
 
 %changelog
+* Fri Jun  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9-7
+- fix license tag
+- fix compile with gcc 4.3
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9-6
 - Autorebuild for GCC 4.3