rpms/lcdproc/devel lcdproc-0.5.2-memset_swp.patch, NONE, 1.1 lcdproc.spec, 1.2, 1.3
Chauvet (kwizart)
fedora-extras-commits at redhat.com
Sun Aug 12 18:51:49 UTC 2007
Author: kwizart
Update of /cvs/extras/rpms/lcdproc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13741
Modified Files:
lcdproc.spec
Added Files:
lcdproc-0.5.2-memset_swp.patch
Log Message:
Fix and rebuild for f8
lcdproc-0.5.2-memset_swp.patch:
--- NEW FILE lcdproc-0.5.2-memset_swp.patch ---
--- 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;
}
}
Index: lcdproc.spec
===================================================================
RCS file: /cvs/extras/rpms/lcdproc/devel/lcdproc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lcdproc.spec 30 Jun 2007 06:28:37 -0000 1.2
+++ lcdproc.spec 12 Aug 2007 18:51:16 -0000 1.3
@@ -2,11 +2,12 @@
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 @@
Requires(post): /sbin/chkconfig
Requires(postun): /sbin/chkconfig
-Requires: perl-Geo-METAR
-
%description
@@ -49,11 +48,13 @@
%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 @@
%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 @@
%{_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
More information about the fedora-extras-commits
mailing list