- Split kernel modules into separate package.

- Disable debugging features.

lirc.spec

@@ -1,18 +1,12 @@
-# Driver TODO, sometime maybe:
-# - caraca (req: caraca, http://caraca.sf.net/)
-# - irman: (req: libirman, http://lirc.sf.net/software/snapshots/)
-# Other TODO:
+# TODO:
+# - caraca driver (req: caraca, http://caraca.sf.net/)
+# - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
+# - bcond_without for alsa, portaudio, x?
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
-# - Verify that the kernel modules work and correct /dev entries get created
-#   automagically with proper permissions etc.
-
-%{!?kver: %{expand: %%define kver %(uname -r)}}
-%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
-%define mdir /lib/modules/%{kver}/extra
 
 Name:           lirc
 Version:        0.8.0
@@ -29,14 +23,12 @@ Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{!?_with_modules:1}
 BuildRequires:  %{__perl}
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libusb-devel
 BuildRequires:  portaudio-devel >= 18
 Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel
-%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
@@ -57,43 +49,12 @@ Requires:       %{name} = %{version}-%{release}
 %description    devel
 %{summary}.
 
-%package     -n kernel-module-%{name}-%{kver}
-Summary:        Kernel modules for LIRC
-Group:          System Environment/Kernel
-Provides:       kernel-module
-Provides:       kernel-module-%{name} = %{version}
-%if 0%{?_with_modules:1}
-BuildRequires:  kernel-devel-%{_target_cpu} = %{kver}
-%endif
-Requires:       %{name} = %{version}
-Requires:       module-init-tools
-Requires:       kernel-%{_target_cpu} = %{kver}
-Requires:       udev
-
-%description -n kernel-module-%{name}-%{kver}
-LIRC kernel modules built for kernel
-%{kver} (%{_target_cpu}).
-
 
 %prep
 %setup -q -n %{name}-%{version}pre2
 %patch0 -p1
-
-# *cough*
-echo %{kver} | grep -q _FC5 && \
-   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/*
-
 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
 
 
@@ -101,31 +62,18 @@ touch -r aclocal.m4 configure.in # avoid autofoo re-run
 %configure \
   --disable-static \
   --disable-dependency-tracking \
-  --enable-debug \
   --enable-sandboxed \
   --with-syslog=LOG_DAEMON \
-%if 0%{?_with_modules:1}
-  --with-kerneldir=%{ksrc} \
-  --with-moduledir=%{mdir}/%{name} \
-  --with-driver=all
-make %{?_smp_mflags} -C drivers
-%else
   --with-driver=userspace
 make %{?_smp_mflags}
-%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 
-%if 0%{?_with_modules:1}
-make install DESTDIR=$RPM_BUILD_ROOT -C drivers
-# executable here to allow stripping, fixed later in %%files
-chmod +x $RPM_BUILD_ROOT%{mdir}/%{name}/*.ko
-
-%else
 make install DESTDIR=$RPM_BUILD_ROOT
 %{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*}
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
   's|/etc/|%{_sysconfdir}/|g ;
@@ -133,16 +81,19 @@ install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
    s|/usr/sbin/|%{_sbindir}/|g' \
   $RPM_BUILD_ROOT%{_initrddir}/lirc
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
+
 mkdir __docs
 cp -pR doc contrib __docs
 cd __docs
 rm -rf doc/Makefile* doc/.libs doc/man* contrib/lirc.* contrib/sendxevent.c
 cd ..
+
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+
 install -dm 755 $RPM_BUILD_ROOT/dev
 touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
-%endif
 
 
 %clean
@@ -153,9 +104,6 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 /sbin/chkconfig --add lirc
 
-%post -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
-
 %preun
 if [ $1 -eq 0 ] ; then
   %{_initrddir}/lirc stop >/dev/null || :
@@ -168,11 +116,7 @@ if [ $1 -gt 0 ] ; then
   %{_initrddir}/lirc try-restart >/dev/null || :
 fi
 
-%postun -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
-
 
-%if 0%{!?_with_modules:1}
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
@@ -192,16 +136,13 @@ depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 %defattr(-,root,root,-)
 %{_includedir}/lirc/
 %{_libdir}/liblirc_client.so
-%endif
-
-%if 0%{?_with_modules:1}
-%files -n kernel-module-%{name}-%{kver}
-%defattr(644,root,root,755)
-%{mdir}/
-%endif
 
 
 %changelog
+* Tue Dec 27 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Split kernel modules into separate package.
+- Disable debugging features.
+
 * 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.