rpms/lirc/devel .cvsignore, 1.6, 1.7 lirc.spec, 1.9, 1.10 sources, 1.6, 1.7 lirc-0.8.0pre1-2615usb.patch, 1.1, NONE lirc-cvs20051129.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18100

Modified Files:
	.cvsignore lirc.spec sources 
Removed Files:
	lirc-0.8.0pre1-2615usb.patch lirc-cvs20051129.patch 
Log Message:
* Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre2
- 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
- lirc_clientd renamed to lircrcd.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Nov 2005 08:58:17 -0000	1.6
+++ .cvsignore	14 Dec 2005 21:07:23 -0000	1.7
@@ -1 +1 @@
-lirc-0.8.0pre1.tar.bz2
+lirc-0.8.0pre2.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lirc.spec	29 Nov 2005 08:58:17 -0000	1.9
+++ lirc.spec	14 Dec 2005 21:07:23 -0000	1.10
@@ -16,19 +16,17 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre1%{?dist}
+Release:        0.2.pre2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre1.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
-Patch1:         %{name}-cvs20051129.patch
-Patch2:         %{name}-0.8.0pre1-2615usb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{!?_with_modules:1}
@@ -78,18 +76,24 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
+%setup -q -n %{name}-%{version}pre2
 %patch0 -p1
-%patch1 -p1
-%patch2
+
+# *cough*
 echo %{kver} | grep -q _FC5 && \
-   sed -i -e s/2,6,15/2,6,14/ drivers/lirc_{dev,imon,sasem}/lirc_*.c # *cough*
+   sed -i -e 's/KERNEL_VERSION(2,\s*6,\s*15)/KERNEL_VERSION(2,6,14)/' \
+   drivers/kcompat.h drivers/lirc_{imon,sasem}/lirc_*.c
+
 chmod 644 contrib/*
-# cmdir: unknown symbols
+
+sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
+
+# cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels)
 # gpio: missing drivers/media/video/{bttv,bttvp}.h in kernel-devel
 for drv in cmdir gpio ; do
   sed -i -e "/^\\s*(lirc_dev lirc_$drv)/d" -e "/^\\s*lirc_$drv/d" configure*
 done
+
 touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -179,7 +183,7 @@
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %{_libdir}/liblirc_client.so.*
-%{_mandir}/man1/ir*.1*
+%{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
 %ghost /dev/lirc*
@@ -198,6 +202,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre2
+- 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
+- lirc_clientd renamed to lircrcd.
+
 * Tue Nov 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre1
 - Pull security fix for the new lirc_clientd from upstream CVS, and
   while at it, some other useful post-0.8.0pre1 changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Nov 2005 08:58:17 -0000	1.6
+++ sources	14 Dec 2005 21:07:23 -0000	1.7
@@ -1 +1 @@
-d115ec757ee1f3b25071f24c8256ee31  lirc-0.8.0pre1.tar.bz2
+80aaee5c1b5815f115b1e14d49f36cd5  lirc-0.8.0pre2.tar.bz2


--- lirc-0.8.0pre1-2615usb.patch DELETED ---


--- lirc-cvs20051129.patch DELETED ---