SPECS: lirc.spec - fixed with-smp %files - removed 2.4. modutiles ...

luzik luzik at pld-linux.org
Tue Jan 3 09:52:45 CET 2006


Author: luzik                        Date: Tue Jan  3 08:52:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed with-smp %files
- removed 2.4. modutiles req
- rel 0.9 (working fine for me)

---- Files affected:
SPECS:
   lirc.spec (1.118 -> 1.119) 

---- Diffs:

================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.118 SPECS/lirc.spec:1.119
--- SPECS/lirc.spec:1.118	Mon Jan  2 15:21:11 2006
+++ SPECS/lirc.spec	Tue Jan  3 09:52:39 2006
@@ -11,13 +11,12 @@
 %bcond_without	x		# without X11-based utilitied
 #
 %define		_kernelsrcdir	/usr/src/linux
-#%define		drivers		"lirc_gpio lirc_it87 lirc_serial lirc_atiusb lirc_mceusb lirc_sir lirc_bt829 lirc_i2c lirc_mceusb2 lirc_streamzap lirc_cmdir lirc_igorplugusb lirc_parallel lirc_dev lirc_imon lirc_sasem"
 %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_parallel lirc_gpio"
 Summary:	Linux Infrared Remote Control daemons
 Summary(pl):	Serwery do zdalnego sterowania Linuksem za pomocą podczerwieni
 Name:		lirc
 Version:	0.8.0
-%define	_rel	0.1
+%define	_rel	0.9
 %define	_pre	pre3
 Release:	%{_rel}
 License:	GPL
@@ -137,7 +136,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-char-lirc-atiusb
@@ -162,7 +160,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-char-lirc-bt829
@@ -187,7 +184,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-char-lirc-cmdir
@@ -211,7 +207,6 @@
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-dev
@@ -238,7 +233,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-gpio
@@ -265,7 +259,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-i2c
@@ -292,7 +285,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-igorplugusb
@@ -319,7 +311,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-imon
@@ -346,7 +337,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-char-lirc-it87
@@ -371,7 +361,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-char-lirc-mceusb
@@ -396,7 +385,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-char-lirc-sasem
@@ -421,7 +409,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 %{?with_dist_kernel:Requires:	setserial}
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
@@ -449,7 +436,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-streamzap
@@ -475,7 +461,6 @@
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-parallel
@@ -501,7 +486,6 @@
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-sir
@@ -528,7 +512,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-smp-char-lirc-atiusb
@@ -553,7 +536,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-smp-char-lirc-bt829
@@ -578,7 +560,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-smp-char-lirc-cmdir
@@ -602,7 +583,6 @@
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-dev
@@ -629,7 +609,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-gpio
@@ -656,7 +635,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-i2c
@@ -683,7 +661,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-spm-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-igorplugusb
@@ -710,7 +687,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-imon
@@ -737,7 +713,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-smp-char-lirc-it87
@@ -762,7 +737,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-smp-char-lirc-mceusb
@@ -787,7 +761,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel-smp-char-lirc-sasem
@@ -812,7 +785,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 %{?with_dist_kernel:Requires:	setserial}
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
@@ -840,7 +812,6 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
 Requires:	kernel-smp-char-lirc-dev = %{version}-%{_rel}@%{_kernel_ver_str}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-streamzap
@@ -866,7 +837,6 @@
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-parallel
@@ -892,7 +862,6 @@
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Requires:	%{name} = %{version}-%{_rel}
-Requires:	modutils >= 2.4.6-4
 Conflicts:	dev < 2.8.0-3
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-sir
@@ -925,7 +894,7 @@
 obsługiwanych przez lirc.
 
 %prep
-%setup -q -a 1 -n %{name}-%{version}pre3
+%setup -q -a 1 -n %{name}-%{version}%{_pre}
 %patch0 -p1
 %patch1 -p1
 #%patch2 -p1
@@ -1482,6 +1451,7 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/*/lirc_sir*
 
+%if %{with smp}
 %files -n kernel-smp-char-lirc-atiusb
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/*/lirc_atiusb*
@@ -1545,6 +1515,7 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/*/lirc_sir*
 %endif
+%endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1552,6 +1523,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.119  2006/01/03 08:52:39  luzik
+- fixed with-smp %files
+- removed 2.4. modutiles req
+- rel 0.9 (working fine for me)
+
 Revision 1.118  2006/01/02 14:21:11  luzik
 - added kernel-source BR (some bttv .h files???)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lirc.spec?r1=1.118&r2=1.119&f=u



More information about the pld-cvs-commit mailing list