From f048179bdaff19bbb0923b9d5358b08a43d91dda Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@fedoraproject.org>
Date: Aug 12 2007 18:51:16 +0000
Subject: Fix and rebuild for f8


---

diff --git a/lcdproc-0.5.2-memset_swp.patch b/lcdproc-0.5.2-memset_swp.patch
new file mode 100644
index 0000000..3b36a7a
--- /dev/null
+++ b/lcdproc-0.5.2-memset_swp.patch
@@ -0,0 +1,20 @@
+--- lcdproc-0.5.2/server/drivers/pylcd.c.memset_swp	2007-08-12 19:27:34.000000000 +0200
++++ lcdproc-0.5.2/server/drivers/pylcd.c	2007-08-12 19:42:05.000000000 +0200
+@@ -118,7 +118,7 @@
+ 
+     if (zeichen!=0x02)
+     {
+-        memset(buffer, MAXCOUNT, 0);
++        memset(buffer, 0, MAXCOUNT);
+         return False;
+     }
+ 
+@@ -146,7 +146,7 @@
+     }
+     else
+     {
+-        memset(buffer, MAXCOUNT, 0);
++        memset(buffer, 0, MAXCOUNT);
+         return False;
+     }
+ }
diff --git a/lcdproc.spec b/lcdproc.spec
index d96f313..fcab446 100644
--- a/lcdproc.spec
+++ b/lcdproc.spec
@@ -2,11 +2,12 @@ Summary:        LCDproc displays real-time system information on a 20x4 backlit 
 Name:           lcdproc	
 Version:        0.5.2
 Release:        2%{?dist}
-License:        GPL
+License:        GPLv2
 Url:            http://lcdproc.omnipotent.net
 Group:          System Environment/Libraries	
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         lcdproc-0.5.2-scripts.patch 
+Patch0:         lcdproc-0.5.2-scripts.patch
+Patch1:         lcdproc-0.5.2-memset_swp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
@@ -31,8 +32,6 @@ BuildRequires:  svgalib-devel
 Requires(post):  /sbin/chkconfig
 Requires(postun):  /sbin/chkconfig
 
-Requires:  perl-Geo-METAR
-
 
 
 %description
@@ -49,11 +48,13 @@ See also http://lcdproc.omnipotent.net.
 %prep
 %setup -q
 %patch0 -p1 -b .initscripts
+%patch1 -p1 -b .memset_swp
 chmod 644 server/drivers/timing.h
 
 
 %build
-%configure --libdir=%{_libdir} \
+%configure \
+  --sysconfdir=%{_sysconfdir}/sysconfig/%{name} \
   --enable-libusb \
   --enable-ldap \
   --enable-drivers=all \
@@ -89,7 +90,7 @@ install -pm 0755 scripts/init-lcdproc.rpm  $RPM_BUILD_ROOT%{_initrddir}/lcdproc
 
 %post
 if [ $1 -eq 1 ]; then
-# Add init script and but don't start it
+# Add init script but don't start it
   /sbin/chkconfig --add LCDd 
   /sbin/chkconfig --add lcdproc ||:
 fi
@@ -117,14 +118,17 @@ rm -rf $RPM_BUILD_ROOT __doc
 %{_libdir}/lcdproc/*
 %{_sbindir}/*
 %{_mandir}/man?/*
-%config(noreplace) %{_sysconfdir}/*.conf
+%dir %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}/*.conf
 %{_initrddir}/LCDd
 %{_initrddir}/lcdproc
 
 
 %changelog
-* Sat Jun 30 2007 kwizart < kwizart at gmail.com > 0.5.2-2
-- Add Requires perl-Geo-METAR
+* Sun Aug 12 2007 kwizart < kwizart at gmail.com > 0.5.2-2
+- Fix memset swap from djones advice
+- License is GPLv2
+- Fix #246971 
 
 * Sat May 19 2007 kwizart < kwizart at gmail.com > 0.5.2-1
 - Update to 0.5.2