From 15c053a6d0174783cc0f539b286bb081be075fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 2 Jul 2006 09:02:42 +0000 Subject: [PATCH] - 0.8.1pre1. - Add rpmbuild options for enabling/disabling ALSA, portaudio and/or X support, ALSA and X enabled by default, portaudio not. - Split most of the documentation to -doc subpackage. - Install irman2lirc as non-doc. --- .cvsignore | 2 +- lirc.spec | 91 ++++++++++++++++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 80 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6c541a..8d80460 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lirc-0.8.0.tar.bz2 +lirc-0.8.1pre1.tar.bz2 diff --git a/lirc.spec b/lirc.spec index e99481b..7dfaa0e 100644 --- a/lirc.spec +++ b/lirc.spec @@ -4,19 +4,25 @@ # - 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? +# - split into -libs and -utils (daemons in main package)? # - 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. +%bcond_without alsa +%bcond_with portaudio +%bcond_with svgalib +%bcond_without x + Name: lirc -Version: 0.8.0 -Release: 3%{?dist} +Version: 0.8.1 +Release: 0.1.pre1%{?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://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2 +Source0: http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre1.tar.bz2 Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-optflags.patch @@ -24,11 +30,19 @@ Patch1: %{name}-0.8.0-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{__perl} -BuildRequires: alsa-lib-devel -BuildRequires: libXt-devel BuildRequires: libusb-devel +%if %{with alsa} +BuildRequires: alsa-lib-devel +%endif +%if %{with portaudio} BuildRequires: portaudio-devel >= 18 -Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel +%endif +%if %{with svgalib} +BuildRequires: svgalib-devel +%endif +%if %{with x} +BuildRequires: libXt-devel +%endif Requires(post): /sbin/chkconfig Requires(post): /sbin/ldconfig Requires(preun): /sbin/chkconfig @@ -47,15 +61,44 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -%{summary}. +LIRC is a package that allows you to decode and send infra-red and +other signals of many (but not all) commonly used remote controls. +Included applications include daemons which decode the received +signals as well as user space applications which allow controlling a +computer with a remote control. This package includes files for +developing applications that use LIRC. + +%package doc +Summary: LIRC documentation +Group: Documentation + +%description doc +LIRC is a package that allows you to decode and send infra-red and +other signals of many (but not all) commonly used remote controls. +Included applications include daemons which decode the received +signals as well as user space applications which allow controlling a +computer with a remote control. This package contains LIRC +documentation and a collection of remote control configuration files. %prep -%setup -q +%setup -q -n %{name}-%{version}pre1 %patch0 -p1 %patch1 -p1 chmod 644 contrib/* -sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf* +sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc +sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo +sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs +# *cough* I wish there was a good way to disable alsa/portaudio/svgalib... +%if ! %{with alsa} +sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure* +%endif +%if ! %{with portaudio} +sed -i -e 's/portaudio.h/PORTAUDIO_DISABLED/g' configure* +%endif +%if ! %{with svgalib} +sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure* +%endif touch -r acconfig.h aclocal.m4 configure.in # avoid autofoo re-run @@ -64,6 +107,9 @@ touch -r acconfig.h aclocal.m4 configure.in # avoid autofoo re-run --disable-static \ --disable-dependency-tracking \ --enable-sandboxed \ +%if ! %{with x} + --without-x \ +%endif --with-syslog=LOG_DAEMON \ --with-driver=userspace make %{?_smp_mflags} @@ -73,7 +119,14 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT -%{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*} +install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir} +%if ! %{with svgalib} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1* +%endif +%if ! %{with x} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/irxevent.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xmode2.1* +%endif install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc %{__perl} -pi -e \ @@ -86,7 +139,8 @@ 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 +rm -rf doc/Makefile* doc/.libs doc/man* +rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c cd .. touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf @@ -120,7 +174,7 @@ fi %files %defattr(-,root,root,-) -%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/* +%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO %ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf %config(noreplace) %{_sysconfdir}/sysconfig/lirc %{_initrddir}/lirc @@ -138,8 +192,19 @@ fi %{_includedir}/lirc/ %{_libdir}/liblirc_client.so +%files doc +%defattr(-,root,root,-) +%doc __docs/* remotes/ + %changelog +* Sat Jul 1 2006 Ville Skyttä - 0.8.1-0.1.pre1 +- 0.8.1pre1. +- Add rpmbuild options for enabling/disabling ALSA, portaudio and/or X + support, ALSA and X enabled by default, portaudio not. +- Split most of the documentation to -doc subpackage. +- Install irman2lirc as non-doc. + * Tue Feb 14 2006 Ville Skyttä - 0.8.0-3 - Avoid standard rpaths on lib64 archs. diff --git a/sources b/sources index 285dc1e..d1f3d86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0bf28bf82c7766a462f90927b6bf3af1 lirc-0.8.0.tar.bz2 +acb6340078bde9628f5ae848fec0583c lirc-0.8.1pre1.tar.bz2