SPECS: lirc.spec - lirc_gpio module fails to build on kernel >= 2....

[hawk]

Author: hawk                         Date: Thu Jan 24 21:23:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lirc_gpio module fails to build on kernel >= 2.6.23, added ugly hack
  to disable it on 2.6.23.x series, seems to work ok
- release 3

---- Files affected:
SPECS:
   lirc.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.150 SPECS/lirc.spec:1.151
--- SPECS/lirc.spec:1.150	Thu Jan 24 19:14:27 2008
+++ SPECS/lirc.spec	Thu Jan 24 22:23:08 2008
@@ -22,13 +22,20 @@
 %endif
 
 %define		pname	lirc
-%define		rel	2
+%define		rel	3
+
 
 #
 # main package
 #
 # lirc_parallel is not thread safe, so not on this list
+# lirc_gpio fails to build under kernel >= 2.6.23
+#
+%if "%{_kernel_ver}" >= "2.6.23"
+%define		drivers		"lirc_it87 lirc_serial lirc_atiusb lirc_mceusb lirc_sir lirc_bt829 lirc_i2c lirc_mceusb2 lirc_streamzap lirc_cmdir lirc_igorplugusb lirc_dev lirc_imon lirc_sasem"
+%else
 %define		drivers		"lirc_it87 lirc_serial lirc_atiusb lirc_mceusb lirc_sir lirc_bt829 lirc_i2c lirc_mceusb2 lirc_streamzap lirc_cmdir lirc_igorplugusb lirc_dev lirc_imon lirc_sasem lirc_gpio"
+%endif
 %define		no_install_post_strip 1
 Summary:	Linux Infrared Remote Control daemons
 Summary(pl.UTF-8):	Serwery do zdalnego sterowania Linuksem za pomocą podczerwieni
@@ -54,6 +61,7 @@
 Patch7:		%{pname}-remotes.patch
 Patch8:		%{pname}-vserver.patch
 Patch9:		%{pname}-kernelcc.patch
+Patch10:	%{pname}-2.6.23.patch
 URL:		http://www.lirc.org/
 #%{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 BuildRequires:	autoconf
@@ -591,6 +599,9 @@
 %patch8 -p1
 %endif
 %patch9 -p1
+%if "%{_kernel_ver}" >= "2.6.23"
+%patch10 -p1
+%endif
 
 %build
 echo '#' > drivers/Makefile.am
@@ -955,9 +966,11 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/*/lirc_dev*
 
+%if "%{_kernel_ver}" < "2.6.23"
 %files -n kernel%{_alt_kernel}-char-lirc-gpio
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/*/lirc_gpio*
+%endif
 
 %files -n kernel%{_alt_kernel}-char-lirc-i2c
 %defattr(644,root,root,755)
@@ -1009,6 +1022,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2008-01-24 21:23:08  hawk
+- lirc_gpio module fails to build on kernel >= 2.6.23, added ugly hack
+  to disable it on 2.6.23.x series, seems to work ok
+- release 3
+
 Revision 1.150  2008-01-24 18:14:27  hawk
 - make modpost errors non-fatal
 - added vserver bcond, allows to build modules for non-vserver kernels
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lirc.spec?r1=1.150&r2=1.151&f=u