SPECS: lirc.spec - updated todo - some cleanups/unifications

qboosh qboosh at pld-linux.org
Sat Aug 25 23:46:06 CEST 2007


Author: qboosh                       Date: Sat Aug 25 21:46:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated todo
- some cleanups/unifications

---- Files affected:
SPECS:
   lirc.spec (1.141 -> 1.142) 

---- Diffs:

================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.141 SPECS/lirc.spec:1.142
--- SPECS/lirc.spec:1.141	Wed Aug 22 11:20:49 2007
+++ SPECS/lirc.spec	Sat Aug 25 23:46:00 2007
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
 # TODO
+# - fix build --without kernel
+# - restore lirc_parallel driver
 # - try to make it use builder_kernel_modules and install_kernel_modules; I couldn't make it
 # - investigate Patch8: vserver; non-vserver enabled kernels don't have the find_task_by_real_pid function (like kernel-desktop)
 #
@@ -17,7 +19,7 @@
 #
 # main package
 #
-# lirc_parallel is not trhead safe, so not on this list
+# lirc_parallel is not thread safe, so not on this list
 %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"
 %define		no_install_post_strip 1
 Summary:	Linux Infrared Remote Control daemons
@@ -70,6 +72,20 @@
 wysyłanie sygnałów w podczerwieni za pomocą wielu (ale nie wszystkich)
 popularnych urządzeń do zdalnego sterowania.
 
+%package remotes
+Summary:	Lirc remotes database
+Summary(pl.UTF-8):	Baza pilotów obsługiwanych przez lirc
+Group:		Documentation
+Requires:	%{name} = %{version}-%{_rel}
+
+%description remotes
+This package contains configuration files for many remotes supported
+by lirc.
+
+%description remotes -l pl.UTF-8
+Ten pakiet zawiera pliki konfiguracyjne dla wielu pilotów
+obsługiwanych przez lirc.
+
 %package X11
 Summary:	Linux Infrared Remote Control - X11 utilities
 Summary(pl.UTF-8):	Zdalne sterowanie Linuksem za pomocą podczerwieni - narzędzia X11
@@ -226,9 +242,9 @@
 %endif
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-dev
+Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-dev
 This package contains the kernel modules necessary to operate some
@@ -254,9 +270,9 @@
 %endif
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-gpio
+Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-gpio
 This package contains the kernel modules necessary to operate some
@@ -282,9 +298,9 @@
 %endif
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-i2c
+Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-i2c
 This package contains the kernel modules necessary to operate some
@@ -310,9 +326,9 @@
 %endif
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-igorplugusb
+Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-igorplugusb
 This package contains the kernel modules necessary to operate some
@@ -338,9 +354,9 @@
 %endif
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-imon
+Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-imon
 This package contains the kernel modules necessary to operate some
@@ -445,9 +461,9 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 %{?with_dist_kernel:Requires:	setserial}
-Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-serial
+Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-serial
 This package contains the kernel modules necessary to operate some
@@ -473,9 +489,9 @@
 %endif
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-streamzap
+Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-streamzap
 This package contains the kernel modules necessary to operate some
@@ -490,35 +506,6 @@
 
 Moduł lirc_streamzap.
 
-## Unused now, as all kernels are smp by default
-#%package -n kernel%{_alt_kernel}-char-lirc-parallel
-#Summary:	Kernel modules for Linux Infrared Remote Control
-#Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-#Release:	%{_rel}@%{_kernel_ver_str}
-#Group:		Base/Kernel
-#%if %{with dist_kernel}
-#%requires_releq_kernel
-#Requires(postun):	%releq_kernel
-#%endif
-#Requires(post,postun):	/sbin/depmod
-#Requires:	%{name} = %{version}-%{_rel}
-#Conflicts:	dev < 2.8.0-3
-#Obsoletes:	lirc-modules
-#Obsoletes:	lirc-modules-parallel
-#
-#%description -n kernel%{_alt_kernel}-char-lirc-parallel
-#This package contains the kernel modules necessary to operate some
-#infrared remote control devices (such as the ones bundled with TV
-#cards).
-#
-#lirc-parallel module for devices connected to parallel port.
-#
-#%description -n kernel%{_alt_kernel}-char-lirc-parallel -l pl.UTF-8
-#Ten pakiet zawiera moduły jądra niezbędne do obsługi niektórych
-#pilotów na podczerwień (w tym tych dostarczanych z kartami TV).
-#
-#Moduł lirc_parallel dla urządzeń podłączanych do portu równoległego.
-
 %package -n kernel%{_alt_kernel}-char-lirc-sir
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
@@ -530,9 +517,9 @@
 %endif
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-sir
+Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-sir
 This package contains the kernel modules necessary to operate some
@@ -547,19 +534,34 @@
 
 Moduł lirc_sir.
 
-%package	remotes
-Summary:	Lirc remotes database
-Summary(pl.UTF-8):	Baza pilotów obsługiwanych przez lirc
-Group:		Documentation
+## XXX: Unused now, as all kernels are smp by default
+%package -n kernel%{_alt_kernel}-char-lirc-parallel
+Summary:	Kernel modules for Linux Infrared Remote Control
+Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
+%endif
+Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
+Obsoletes:	lirc-modules
+Obsoletes:	lirc-modules-parallel
+Conflicts:	dev < 2.8.0-3
 
-%description remotes
-This package contains configuration files for many remotes supported
-by lirc.
+%description -n kernel%{_alt_kernel}-char-lirc-parallel
+This package contains the kernel modules necessary to operate some
+infrared remote control devices (such as the ones bundled with TV
+cards).
 
-%description remotes -l pl.UTF-8
-Ten pakiet zawiera pliki konfiguracyjne dla wielu pilotów
-obsługiwanych przez lirc.
+lirc-parallel module for devices connected to parallel port.
+
+%description -n kernel%{_alt_kernel}-char-lirc-parallel -l pl.UTF-8
+Ten pakiet zawiera moduły jądra niezbędne do obsługi niektórych
+pilotów na podczerwień (w tym tych dostarczanych z kartami TV).
+
+Moduł lirc_parallel dla urządzeń podłączanych do portu równoległego.
 
 %prep
 %setup -q -a 1
@@ -634,7 +636,7 @@
 
 for drv in $drivers; do
 	cd $drv
-	if [ "$drv" == "lirc_parallel" ] && [ "dist" == "dist" ]; then
+	if [ "$drv" == "lirc_parallel" ] && grep -q ^CONFIG_SMP o/.config ]; then
 		echo "lirc_parallel is not smp safe"
 	else
 		ln -sf ../o
@@ -852,15 +854,15 @@
 %postun	-n kernel%{_alt_kernel}-char-lirc-streamzap
 %depmod %{_kernel_ver}
 
-#%post	-n kernel%{_alt_kernel}-char-lirc-parallel
-#%depmod %{_kernel_ver}
-#if [ "$1" = "1" ]; then
-#	echo "Don't forget to add an 'alias lirc lirc_parallel' line"
-#	echo "to your /etc/modules.conf."
-#fi
-#
-#%postun	-n kernel%{_alt_kernel}-char-lirc-parallel
-#%depmod %{_kernel_ver}
+%post	-n kernel%{_alt_kernel}-char-lirc-parallel
+%depmod %{_kernel_ver}
+if [ "$1" = "1" ]; then
+	echo "Don't forget to add an 'alias lirc lirc_parallel' line"
+	echo "to your /etc/modules.conf."
+fi
+
+%postun	-n kernel%{_alt_kernel}-char-lirc-parallel
+%depmod %{_kernel_ver}
 
 %post	-n kernel%{_alt_kernel}-char-lirc-sir
 %depmod %{_kernel_ver}
@@ -984,14 +986,14 @@
 %files -n kernel%{_alt_kernel}-char-lirc-sir
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/*/lirc_sir*
-%endif
 
-# currently not SMP-safe
-#%if 0
-#%files -n kernel%{_alt_kernel}-char-lirc-parallel
-#%defattr(644,root,root,755)
-#/lib/modules/%{_kernel_ver}/*/lirc_parallel*
-#%endif
+# XXX currently not SMP-safe
+%if 0
+%files -n kernel%{_alt_kernel}-char-lirc-parallel
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/*/lirc_parallel*
+%endif
+%endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -999,6 +1001,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.142  2007/08/25 21:46:00  qboosh
+- updated todo
+- some cleanups/unifications
+
 Revision 1.141  2007/08/22 09:20:49  czarny
 - up to 0.8.2
 - rel 1
================================================================

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



More information about the pld-cvs-commit mailing list