[packages/lirc] - updated to 0.9.3 (no more kernel modules; last version branched as lirc-kernel-modules) - updated
qboosh
qboosh at pld-linux.org
Wed Oct 7 19:50:25 CEST 2015
commit 101b5a26b3a230ac2502efdec3005abcfbeb80ca
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Oct 7 19:51:33 2015 +0200
- updated to 0.9.3 (no more kernel modules; last version branched as lirc-kernel-modules)
- updated tmp patch
- removed obsolete opt,no-svgalib,kernel,kernelcc,sparc,am,format-security patches
format-security.patch | 11 -
lirc-am.patch | 11 -
lirc-kernel.patch | 107 ------
lirc-kernelcc.patch | 14 -
lirc-link.patch | 18 ++
lirc-no-svgalib.patch | 20 --
lirc-opt.patch | 11 -
lirc-sparc.patch | 17 -
lirc-tmp.patch | 36 +--
lirc.spec | 877 ++++++++++----------------------------------------
10 files changed, 200 insertions(+), 922 deletions(-)
---
diff --git a/lirc.spec b/lirc.spec
index 2b1cea0..8ac146f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,96 +1,57 @@
# TODO
-# - restore lirc_parallel driver
-# - try to make it use builder_kernel_modules and install_kernel_modules; I couldn't make it
-# - build is running kernel arch dependent, try to get rid of this
# - libcaraca_client (http://caraca.sourceforge.net/) - no releases yet
-# - create modprobe alias files instead of reminding in post scriptlets
+# - split lirc-remotes.spec, update remotes configs from lirc-remotes project
+# (http://lirc-remotes.sourceforge.net/ incl. remotes-table.html)
#
# Conditional build:
-%bcond_without kernel # don't build kernel modules, only library+programs
-%bcond_without userspace # build only packages with kernel modules
-%bcond_with svga # without svgalib-based utility
+%bcond_without static_libs # static libraries
%bcond_without x # without X11-based utilitied
-# The goal here is to have main, userspace, package built once with
-# simple release number, and only rebuild kernel packages with kernel
-# version as part of release number, without the need to bump release
-# with every kernel change.
-%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
-%{error:kernel and userspace cannot be built at the same time on PLD builders}
-exit 1
-%endif
-
-%if %{without userspace}
-# nothing to be placed to debuginfo package
-%define _enable_debug_packages 0
-%endif
-
-%define pname lirc
-%define rel 106
-#
-# main package
-#
-# lirc_gpio fails to build under kernel >= 2.6.23
-#
-%if %{with kernel}
-%if %{_kernel_version_code} >= %{_kernel_version_magic 2 6 23}
-%if %{_kernel_version_code} >= %{_kernel_version_magic 3 0 0}
-%define drivers "lirc_atiusb lirc_bt829 lirc_dev lirc_i2c lirc_igorplugusb lirc_imon lirc_parallel lirc_sasem lirc_serial lirc_sir lirc_ttusbir"
-%else
-%define drivers "lirc_atiusb lirc_bt829 lirc_dev lirc_i2c lirc_igorplugusb lirc_imon lirc_parallel lirc_sasem lirc_serial lirc_sir lirc_ttusbir lirc_wpc8769l"
-%endif
-%else
-%define drivers "lirc_atiusb lirc_bt829 lirc_dev lirc_gpio lirc_i2c lirc_igorplugusb lirc_imon lirc_parallel lirc_sasem lirc_serial lirc_sir lirc_ttusbir lirc_wpc8769l"
-%endif
-%endif
Summary: Linux Infrared Remote Control daemons
-Summary(pl.UTF-8): Serwery do zdalnego sterowania Linuksem za pomocą podczerwieni
-Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 0.9.0
-Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
+Summary(pl.UTF-8): Demony do zdalnego sterowania Linuksem za pomocą podczerwieni
+Name: lirc
+Version: 0.9.3
+Release: 1
License: GPL v2+
Group: Daemons
-Source0: http://downloads.sourceforge.net/lirc/%{pname}-%{version}.tar.bz2
-# Source0-md5: b232aef26f23fe33ea8305d276637086
+Source0: http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+# Source0-md5: 0a507613d06195a8daab9123190e16fe
Source1: http://lirc.sourceforge.net/remotes.tar.bz2
# Source1-md5: 238d1773d3c405acc02813674f5a55f8
-Source2: %{pname}d.sysconfig
-Source3: %{pname}d.init
-Source4: %{pname}md.init
-Source5: %{pname}.tmpfiles
-Patch0: %{pname}-opt.patch
-Patch1: %{pname}-tmp.patch
-Patch2: %{pname}-no-svgalib.patch
-Patch3: %{pname}-kernel.patch
-Patch4: %{pname}-sparc.patch
-Patch5: %{pname}-remotes.patch
-Patch6: %{pname}-kernelcc.patch
-Patch7: format-security.patch
-Patch8: %{pname}-am.patch
+Source2: %{name}d.sysconfig
+Source3: %{name}d.init
+Source4: %{name}md.init
+Source5: %{name}.tmpfiles
+Patch0: %{name}-tmp.patch
+Patch1: %{name}-remotes.patch
+Patch2: %{name}-link.patch
URL: http://www.lirc.org/
BuildRequires: alsa-lib-devel
BuildRequires: autoconf >= 2.50
BuildRequires: automake
+BuildRequires: doxygen
BuildRequires: iguanaIR-devel
BuildRequires: libftdi-devel >= 0.12
BuildRequires: libirman-devel >= 0.4.5
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
BuildRequires: libusb-compat-devel >= 0.1.0
+BuildRequires: libxslt-progs
+BuildRequires: pkgconfig
+BuildRequires: python3 >= 1:3.1
+BuildRequires: python3-PyYAML
BuildRequires: rpmbuild(macros) >= 1.701
-%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
BuildRequires: rpm-pythonprov
-%{?with_svga:BuildRequires: svgalib-devel}
+BuildRequires: systemd-devel
%{?with_x:BuildRequires: xorg-lib-libX11-devel}
Requires(post,preun): /sbin/chkconfig
BuildRequires: rpmbuild(macros) >= 1.268
-Requires: %{pname}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: libftdi >= 0.12
Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%if %{without userspace}
-%define no_spec_install_post_check_tmpfiles 1
-%endif
+# liblirc_driver expects curr_driver to be defined by user
+%define skip_post_check_so liblirc_driver.so.*
%description
LIRC is a package that allows you to decode and send infra-red signals
@@ -105,7 +66,7 @@ popularnych urządzeń do zdalnego sterowania.
Summary: Lirc remotes database
Summary(pl.UTF-8): Baza pilotów obsługiwanych przez lirc
Group: Documentation
-Requires: %{pname} = %{version}-%{rel}
+Requires: %{name} = %{version}-%{release}
%description remotes
This package contains configuration files for many remotes supported
@@ -119,7 +80,7 @@ obsługiwanych przez lirc.
Summary: Linux Infrared Remote Control - X11 utilities
Summary(pl.UTF-8): Zdalne sterowanie Linuksem za pomocą podczerwieni - narzędzia X11
Group: X11/Applications
-Requires: %{pname}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description X11
Linux Infrared Remote Control - X11 utilities.
@@ -127,23 +88,11 @@ Linux Infrared Remote Control - X11 utilities.
%description X11 -l pl.UTF-8
Zdalne sterowanie Linuksem za pomocą podczerwieni - narzędzia X11.
-%package svga
-Summary: Linux Infrared Remote Control - svgalib utilities
-Summary(pl.UTF-8): Zdalne sterowanie Linuksem za pomocą podczerwieni - narzędzia svgalib
-Group: Applications
-Requires: %{pname}-libs = %{version}-%{release}
-
-%description svga
-Linux Infrared Remote Control - svgalib-based utilities.
-
-%description svga -l pl.UTF-8
-Zdalne sterowanie Linuksem za pomocą podczerwieni - narzędzia oparte
-na svgalibie.
-
%package libs
Summary: LIRC libraries
Summary(pl.UTF-8): Biblioteki LIRC
Group: Libraries
+Obsoletes: lirc-svga
Conflicts: lirc < 0.6.3-3
# didn't use /tmp/.lircd
@@ -158,7 +107,7 @@ Ten pakiet zawiera biblioteki niezbędne do działania klientów LIRC.
Summary: Header files for LIRC development
Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia programów z obsługą LIRC
Group: Development/Libraries
-Requires: %{pname}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
This package provides the files necessary to develop LIRC-based
@@ -172,7 +121,7 @@ LIRC.
Summary: Static library for LIRC development
Summary(pl.UTF-8): Biblioteka statyczna LIRC
Group: Development/Libraries
-Requires: %{pname}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
%description static
The files necessary for development of statically-linked lirc-based
@@ -182,653 +131,64 @@ programs.
Pliki potrzebne do tworzenia łączonych statycznie programów opartych
na LIRC.
-%define kernel_pkg()\
-%package -n kernel%{_alt_kernel}-char-lirc-atiusb\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-Conflicts: dev < 2.8.0-3\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-atiusb\
-This package contains the kernel modules necessary to operate some\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_atiusb module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-atiusb -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_atiusb.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-bt829\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-Conflicts: dev < 2.8.0-3\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-bt829\
-This package contains the kernel modules necessary to operate some\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_bt829 module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-bt829 -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_bt829.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-dev\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-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\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_dev module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-dev -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_dev.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-ene0100\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-Obsoletes: lirc-modules\
-Conflicts: dev < 2.8.0-3\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-ene0100\
-This package contains the kernel modules necessary to operate some\
-infrared remote control ene0100ices (such as the ones bundled with TV\
-cards).\
-\
-lirc_ene0100 module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-ene0100 -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_ene0100.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-gpio\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-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\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_gpio module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-gpio -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_gpio.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-i2c\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-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\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_i2c module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-i2c -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_i2c.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-igorplugusb\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-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\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_igorplugusb module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-igorplugusb -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_igorplugusb.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-imon\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-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\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_imon module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-imon -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_imon.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-sasem\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-Conflicts: dev < 2.8.0-3\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-sasem\
-This package contains the kernel modules necessary to operate some\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_sasem module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-sasem -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_sasem.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-serial\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-Requires: setserial\
-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\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_serial module for devices connected to serial port.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-serial -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_serial dla urządzeń podłączanych do portu szeregowego.\
-\
-%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\
-Release: %{rel}@%{_kernel_ver_str}\
-Group: Base/Kernel\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-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\
-infrared remote control devices (such as the ones bundled with TV\
-cards).\
-\
-lirc_sir module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-sir -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_sir.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-ttusbir\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-Obsoletes: lirc-modules\
-Obsoletes: lirc-modules-ttusbir\
-Conflicts: dev < 2.8.0-3\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-ttusbir\
-This package contains the kernel modules necessary to operate\
-TechnoTrend USB IR Receiver.\
-\
-lirc_ttusbir module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-ttusbir -l pl.UTF-8\
-Ten pakiet zawiera moduł kernela niezbędny do obsługi urządzenia\
-TechnoTrend USB IR Receiver.\
-\
-Moduł lirc_ttusbir.\
-\
-%package -n kernel%{_alt_kernel}-char-lirc-wpc87691\
-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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-Conflicts: dev < 2.8.0-3\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-wpc87691\
-This package contains the kernel modules necessary to operate\
-TechnoTrend USB IR Receiver.\
-\
-lirc_wpc87691 module.\
-\
-%description -n kernel%{_alt_kernel}-char-lirc-wpc87691 -l pl.UTF-8\
-Ten pakiet zawiera moduł kernela niezbędny do obsługi urządzenia\
-TechnoTrend USB IR Receiver.\
-\
-Moduł lirc_wpc87691.\
-\
-%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\
-%requires_releq_kernel\
-Requires(postun): %releq_kernel\
-Requires(post,postun): /sbin/depmod\
-Requires: %{pname} = %{version}\
-Obsoletes: lirc-modules\
-Obsoletes: lirc-modules-parallel\
-Conflicts: dev < 2.8.0-3\
-\
-%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.\
-\
-%if %{with kernel}\
-%files -n kernel%{_alt_kernel}-char-lirc-atiusb\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_atiusb.ko*\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-bt829\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_bt829.ko*\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-dev\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_dev.ko*\
-\
-%if %{_kernel_version_code} < %{_kernel_version_magic 3 0 0}\
-%files -n kernel%{_alt_kernel}-char-lirc-ene0100\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_ene0100.ko*\
-%endif\
-\
-%if %{_kernel_version_code} < %{_kernel_version_magic 2 6 23}\
-%files -n kernel%{_alt_kernel}-char-lirc-gpio\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_gpio.ko*\
-%endif\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-i2c\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_i2c.ko*\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-igorplugusb\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_igorplugusb.ko*\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-imon\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_imon.ko*\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-sasem\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_sasem.ko*\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-serial\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_serial.ko*\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-sir\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_sir.ko*\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-ttusbir\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_ttusbir.ko*\
-\
-%if %{_kernel_version_code} < %{_kernel_version_magic 3 0 0}\
-%files -n kernel%{_alt_kernel}-char-lirc-wpc87691\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_wpc8769l.ko*\
-%endif\
-\
-%files -n kernel%{_alt_kernel}-char-lirc-parallel\
-%defattr(644,root,root,755)\
-/lib/modules/%{_kernel_ver}/misc/lirc_parallel.ko*\
-%endif\
-%{nil}
-
-%define kernel_pkg_scriptlets()\
-%post -n kernel%{_alt_kernel}-char-lirc-atiusb\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_atiusb' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-atiusb\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-bt829\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_bt829' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-bt829\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-dev\
-%depmod %{_kernel_ver}\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-dev\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-ene0100\
-%depmod %{_kernel_ver}\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-ene0100\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-gpio\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_gpio' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-gpio\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-i2c\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_i2c' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-i2c\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-igorplugusb\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_igorplugusb' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-igorplugusb\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-imon\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_imon' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-imon\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-sasem\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_sasem' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-sasem\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-serial\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_serial' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-serial\
-%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' modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-parallel\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-sir\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_sir' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-sir\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-ttusbir\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_ttusbir' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-ttusbir\
-%depmod %{_kernel_ver}\
-\
-%post -n kernel%{_alt_kernel}-char-lirc-wpc87691\
-%depmod %{_kernel_ver}\
-if [ "$1" = "1" ]; then\
- echo "Don't forget to add an 'alias lirc lirc_wpc87691' to modprobe config"\
-fi\
-\
-%postun -n kernel%{_alt_kernel}-char-lirc-wpc87691\
-%depmod %{_kernel_ver}\
-%{nil}
-
-%define build_kernel_pkg()\
-%configure \\\
- ac_cv_header_portaudio_h=no \\\
- --with-kerneldir=%{_kernelsrcdir} \\\
- %{?with_x:--with-x} \\\
- --with-port=0x2f8 \\\
- --with-irq=3 \\\
- --without-soft-carrier \\\
- --with-driver=userspace \\\
- --with-igor\
-\
-drivers=%{drivers}\
-for drv in $drivers; do\
- cd drivers/$drv\
- %{__make} clean \\\
- LIRC_DEVDIR=`pwd` \\\
- RCS_FIND_IGNORE="-name '*.ko' -o" \\\
- %{?with_verbose:V=1}\
-\
- %{__make} -j1 \\\
- LIRC_DEVDIR=`pwd` \\\
- CONSTIFY_PLUGIN="" \\\
- KBUILD_MODPOST_WARN=1 \\\
- %{?with_verbose:V=1}\
- cd ../..\
- %install_kernel_modules -D installed -m drivers/$drv/$drv -d misc\
-done\
-%{nil}
-
-%{?with_kernel:%{expand:%create_kernel_packages}}
+%package doc
+Summary: Documentation for LIRC
+Summary(pl.UTF-8): Dokumentacja LIRC-a
+Group: Documentation
+
+%description doc
+Documentation for LIRC.
+
+%description doc -l pl.UTF-8
+Dokumentacja LIRC-a.
%prep
-%setup -q -n %{pname}-%{version} -a 1
+%setup -q -a1
%patch0 -p1
%patch1 -p1
-%if !%{with svga}
%patch2 -p1
-%endif
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%build
-echo '#' > drivers/Makefile.am
%{__libtoolize}
%{__aclocal}
-%{__automake}
-%{__autoheader}
%{__autoconf}
+%{__autoheader}
+%{__automake}
-%if %{with userspace}
%configure \
ac_cv_header_portaudio_h=no \
-%if %{without kernel}
- ac_cv_have_kernel="no_kernel=yes" \
-%endif
- --with-kerneldir=%{_kernelsrcdir} \
- %{?with_x:--with-x} \
- --with-port=0x2f8 \
- --with-irq=3 \
- --without-soft-carrier \
- --with-driver=userspace \
- --with-igor
+ %{?with_static_libs:--enable-static} \
+ %{?with_x:--with-x}
%{__make} -j1
-%endif
-
-%{?with_kernel:%{expand:%build_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
-
-%if %{with kernel}
-cp -a installed/* $RPM_BUILD_ROOT
-%endif
-%if %{with userspace}
install -d $RPM_BUILD_ROOT{%{_bindir},%{_aclocaldir},/dev,/var/{log,run/lirc}} \
$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,lirc} \
$RPM_BUILD_ROOT%{systemdtmpfilesdir}
%{__make} -j1 install \
- DESTDIR=$RPM_BUILD_ROOT \
- sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
+ DESTDIR=$RPM_BUILD_ROOT
-cat>$RPM_BUILD_ROOT%{_sysconfdir}/lirc/lircd.conf<<END
-#
-# This is a placeholder for your configuration file.
-# See %{_docdir}/%{pname}-%{version}/remotes for some examples.
-#
-END
-cp -f $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lirc{,m}d.conf
-cp -p contrib/*.m4 $RPM_BUILD_ROOT%{_aclocaldir}
:> $RPM_BUILD_ROOT/var/log/lircd
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/lircd
install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/lircd
install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/lircmd
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.a
%endif
+# nothing useful
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/lirc/{contrib,plugindocs}
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lircd.conf.d/README.conf.d
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -841,9 +201,6 @@ rm -rf $RPM_BUILD_ROOT
%service lircd restart
%service lircmd restart
-echo "If you are using a kernel-module-based driver, don't forget to"
-echo "install the kernel%{_alt_kernel}-char-lirc-<your_driver> package."
-
%preun
if [ "$1" = "0" ]; then
%service lircd stop
@@ -860,42 +217,121 @@ if [ -f %{_sysconfdir}/lircmd.conf.rpmsave ]; then
mv -f %{_sysconfdir}/lircmd.conf.rpmsave %{_sysconfdir}/lirc/lircmd.conf
fi
-%if %{with userspace}
%files
%defattr(644,root,root,755)
-%doc ANNOUNCE AUTHORS NEWS README TODO ChangeLog
-%doc contrib/lircrc doc/{html,images,lirc.css}
+%doc AUTHORS ChangeLog NEWS README README.conf.d contrib/lircrc doc/{html,lirc.org}
%attr(755,root,root) %{_bindir}/ircat
%attr(755,root,root) %{_bindir}/irexec
+%attr(755,root,root) %{_bindir}/irpipe
%attr(755,root,root) %{_bindir}/irpty
%attr(755,root,root) %{_bindir}/irrecord
%attr(755,root,root) %{_bindir}/irsend
+%attr(755,root,root) %{_bindir}/irsimreceive
+%attr(755,root,root) %{_bindir}/irsimsend
%attr(755,root,root) %{_bindir}/irw
-%attr(755,root,root) %{_bindir}/mode2
+%attr(755,root,root) %{_bindir}/irtestcase
+%attr(755,root,root) %{_bindir}/lirc-config-tool
+%attr(755,root,root) %{_bindir}/lirc-lsremotes
%attr(755,root,root) %{_bindir}/lircrcd
+%attr(755,root,root) %{_bindir}/mode2
%attr(755,root,root) %{_bindir}/pronto2lirc
+%attr(755,root,root) %{_sbindir}/lirc-lsplugins
%attr(755,root,root) %{_sbindir}/lircd
%attr(755,root,root) %{_sbindir}/lircmd
+%dir %{_libdir}/lirc
+%dir %{_libdir}/lirc/plugins
+%attr(755,root,root) %{_libdir}/lirc/plugins/accent.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/alsa_usb.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/atilibusb.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/atwf83.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/audio_alsa.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/awlibusb.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/bte.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/commandir.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/creative.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/creative_infracd.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/default.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/devinput.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/dfclibusb.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/dsp.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/ea65.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/file.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/ftdi.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/hiddev.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/i2cuser.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/iguanaIR.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/irlink.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/irman.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/irtoy.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/livedrive_midi.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/livedrive_seq.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/logitech.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/mouseremote.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/mp3anywhere.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/mplay.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/pcmak.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/pinsys.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/pixelview.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/silitek.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/simreceive.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/simsend.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/slinke.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/srm7500libusb.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/tira.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/udp.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/uirt2.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/uirt2_raw.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/usbx.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/yard2.so
+%attr(755,root,root) %{_libdir}/lirc/plugins/zotac.so
%attr(754,root,root) /etc/rc.d/init.d/lircd
%attr(754,root,root) /etc/rc.d/init.d/lircmd
+%{systemdunitdir}/lircd.service
+%{systemdunitdir}/lircd.socket
+%{systemdunitdir}/lircmd.service
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lircd
%dir %{_sysconfdir}/lirc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lirc/lirc_options.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lirc/lircd.conf
+%{_sysconfdir}/lirc/lircd.conf.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lirc/lircmd.conf
+%dir %{_datadir}/lirc
+%{_datadir}/lirc/configs
+%{_datadir}/lirc/lirc.hwdb
%{_mandir}/man1/ircat.1*
%{_mandir}/man1/irexec.1*
+%{_mandir}/man1/irpipe.1*
%{_mandir}/man1/irpty.1*
%{_mandir}/man1/irrecord.1*
%{_mandir}/man1/irsend.1*
+%{_mandir}/man1/irsimreceive.1*
+%{_mandir}/man1/irsimsend.1*
+%{_mandir}/man1/irtestcase.1*
%{_mandir}/man1/irw.1*
-%{_mandir}/man1/lircrcd.1*
+%{_mandir}/man1/lirc-config-tool.1*
+%{_mandir}/man1/lirc-lsplugins.1*
+%{_mandir}/man1/lirc-lsremotes.1*
%{_mandir}/man1/mode2.1*
+%{_mandir}/man4/lirc.4*
+%{_mandir}/man5/lircd.conf.5*
%{_mandir}/man8/lircd.8*
%{_mandir}/man8/lircmd.8*
+%{_mandir}/man8/lircrcd.8*
%attr(600,root,root) %ghost /var/log/lircd
%dir /var/run/lirc
%{systemdtmpfilesdir}/%{name}.conf
+%attr(755,root,root) %{_bindir}/irdb-get
+%attr(755,root,root) %{_bindir}/lirc-setup
+%{_mandir}/man1/irdb-get.1*
+%{_mandir}/man1/lirc-setup.1*
+%dir %{py3_sitescriptdir}/lirc
+%{py3_sitescriptdir}/lirc/__pycache__
+%{py3_sitescriptdir}/lirc/*.py
+%{py3_sitescriptdir}/lirc/configs
+%{py3_sitescriptdir}/lirc/lirc-setup
+%{py3_sitescriptdir}/lirc/lirc-setup.ui
+
%files remotes
%defattr(644,root,root,755)
# XXX: are jpegs in docs (remotes) a good idea?
@@ -911,26 +347,41 @@ fi
%{_mandir}/man1/xmode2.1*
%endif
-%if %{with svga}
-%files svga
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/smode2
-%{_mandir}/man1/smode2.1*
-%endif
-
%files libs
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libirrecord.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libirrecord.so.0
+%attr(755,root,root) %{_libdir}/liblirc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblirc.so.0
%attr(755,root,root) %{_libdir}/liblirc_client.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/liblirc_client.so.0
+%attr(755,root,root) %{_libdir}/liblirc_driver.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblirc_driver.so.0
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libirrecord.so
+%attr(755,root,root) %{_libdir}/liblirc.so
%attr(755,root,root) %{_libdir}/liblirc_client.so
+%attr(755,root,root) %{_libdir}/liblirc_driver.so
+%{_libdir}/libirrecord.la
+%{_libdir}/liblirc.la
%{_libdir}/liblirc_client.la
+%{_libdir}/liblirc_driver.la
%{_includedir}/lirc
-%{_aclocaldir}/lirc.m4
+%{_includedir}/lirc_client.h
+%{_includedir}/lirc_driver.h
+%{_includedir}/lirc_private.h
+%{_pkgconfigdir}/lirc.pc
+%{_pkgconfigdir}/lirc-driver.pc
%files static
%defattr(644,root,root,755)
+%{_libdir}/libirrecord.a
+%{_libdir}/liblirc.a
%{_libdir}/liblirc_client.a
-%endif
+%{_libdir}/liblirc_driver.a
+
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/lirc
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 06305a2..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lirc-0.9.0/doc/man2html.c~ 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/doc/man2html.c 2012-09-25 14:40:14.082497313 +0200
-@@ -3027,7 +3027,7 @@
- /* for mosaic users */
- printf("<HR>\n<A NAME=\"index\"> </A><H2>Index</H2>\n<DL>\n");
- manidx[mip]=0;
-- printf(manidx);
-+ printf("%s", manidx);
- if (subs) printf("</DL>\n");
- printf("</DL>\n");
- print_sig();
diff --git a/lirc-am.patch b/lirc-am.patch
deleted file mode 100644
index 23ad03a..0000000
--- a/lirc-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lirc-0.9.0/configure.ac~ 2013-03-03 13:36:41.238766080 +0100
-+++ lirc-0.9.0/configure.ac 2013-03-03 13:38:11.952906500 +0100
-@@ -8,7 +8,7 @@
- AC_CONFIG_MACRO_DIR([m4])
-
- AM_INIT_AUTOMAKE(lirc, 0.9.0)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/lirc-kernel.patch b/lirc-kernel.patch
deleted file mode 100644
index d1b55ab..0000000
--- a/lirc-kernel.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- lirc-0.9.0/./drivers/lirc_atiusb/lirc_atiusb.c~ 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/./drivers/lirc_atiusb/lirc_atiusb.c 2011-09-10 11:19:50.422542829 +0200
-@@ -48,7 +48,6 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
--#include <linux/smp_lock.h>
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
---- lirc-0.9.0/drivers/lirc_i2c/lirc_i2c.c~ 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/drivers/lirc_i2c/lirc_i2c.c 2011-09-10 12:24:55.710859996 +0200
-@@ -555,8 +555,8 @@
- kfree(ir);
- return -EINVAL;
- }
-- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
-- adap->id, addr, ir->c.name);
-+ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+ addr, ir->c.name);
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- /* register device */
---- lirc-0.9.0/drivers/lirc_gpio/lirc_gpio.c.orig 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/drivers/lirc_gpio/lirc_gpio.c 2011-09-10 16:30:47.051485373 +0200
-@@ -38,7 +38,6 @@
- #include <linux/errno.h>
-
- #include "../drivers/media/video/bt8xx/bttv.h"
--#include "../drivers/media/video/bt8xx/bttvp.h"
-
- #include "drivers/kcompat.h"
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
---- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c~ 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2012-07-01 14:29:13.757144222 +0200
-@@ -48,6 +48,7 @@
- * Steve Davies <steve at daviesfam.org> July 2001
- */
-
-+#include <linux/version.h>
- #include <linux/module.h>
- #include <linux/errno.h>
- #include <linux/signal.h>
-@@ -66,7 +66,9 @@
- #include <linux/poll.h>
- #include <linux/platform_device.h>
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
- #include <asm/system.h>
-+#endif
- #include <linux/io.h>
- #include <linux/irq.h>
- #include <linux/fcntl.h>
---- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c~ 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2012-07-01 14:29:56.867142704 +0200
-@@ -59,7 +59,9 @@
- #include <linux/mm.h>
- #include <linux/delay.h>
- #include <linux/poll.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
- #include <asm/system.h>
-+#endif
- #include <linux/io.h>
- #include <asm/irq.h>
- #include <linux/fcntl.h>
---- lirc-0.9.0/drivers/lirc_imon/lirc_imon.c~ 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/drivers/lirc_imon/lirc_imon.c 2012-09-25 22:50:43.426536543 +0200
-@@ -61,6 +61,11 @@
-
- #define BIT_DURATION 250 /* each bit received is 250us */
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+#define err(format, arg...) \
-+ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
-+#endif
-+
- /*** P R O T O T Y P E S ***/
-
- /* USB Callback prototypes */
---- lirc-0.9.0/drivers/lirc_sasem/lirc_sasem.c~ 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/drivers/lirc_sasem/lirc_sasem.c 2012-09-25 22:51:20.226535245 +0200
-@@ -73,6 +73,11 @@
-
- #define IOCTL_LCD_CONTRAST 1
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+#define err(format, arg...) \
-+ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
-+#endif
-+
- /*** P R O T O T Y P E S ***/
-
- /* USB Callback prototypes */
---- lirc-0.9.0/drivers/lirc_ttusbir/lirc_ttusbir.c~ 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0/drivers/lirc_ttusbir/lirc_ttusbir.c 2012-09-25 22:51:38.126534613 +0200
-@@ -58,6 +58,11 @@
- #define DPRINTK(_x_, a...)
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+#define err(format, arg...) \
-+ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
-+#endif
-+
- /* function declarations */
- static int probe(struct usb_interface *intf, const struct usb_device_id *id);
- static void disconnect(struct usb_interface *intf);
diff --git a/lirc-kernelcc.patch b/lirc-kernelcc.patch
deleted file mode 100644
index 33c56a2..0000000
--- a/lirc-kernelcc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN lirc-0.8.2/acinclude.m4 lirc-0.8.2.new/acinclude.m4
---- lirc-0.8.2/acinclude.m4 2007-01-16 11:26:21.000000000 +0100
-+++ lirc-0.8.2.new/acinclude.m4 2007-08-22 10:12:50.490344176 +0200
-@@ -38,8 +38,8 @@
- echo " echo \$(VERSION)" >>${ac_pkss_makefile}
- echo "lirc_tell_me_what_patchlevel_is:" >>${ac_pkss_makefile}
- echo " echo \$(PATCHLEVEL)" >>${ac_pkss_makefile}
-- version=$(make -s -C ${kerneldir} -f ${ac_pkss_makefile} lirc_tell_me_what_version_is M=$(pwd))
-- patchlevel=$(make -s -C ${kerneldir} -f ${ac_pkss_makefile} lirc_tell_me_what_patchlevel_is M=$(pwd))
-+ version=$(grep ^VERSION ${kerneldir}/Makefile | cut -d' ' -f3)
-+ patchlevel=$(grep ^PATCHLEVEL ${kerneldir}/Makefile | cut -d' ' -f3)
- if test ${version} -eq 2; then
- if test ${patchlevel} -lt 5; then
- kernelext=o
diff --git a/lirc-link.patch b/lirc-link.patch
new file mode 100644
index 0000000..6fbc332
--- /dev/null
+++ b/lirc-link.patch
@@ -0,0 +1,18 @@
+--- lirc-0.9.3/lib/Makefile.am.orig 2015-09-02 21:43:49.000000000 +0200
++++ lirc-0.9.3/lib/Makefile.am 2015-10-06 16:26:21.296067036 +0200
+@@ -31,6 +31,7 @@
+ util.c
+
+ libirrecord_la_SOURCES = irrecord.c
++libirrecord_la_LIBADD = liblirc.la
+
+ liblirc_client_la_LDFLAGS = -version-info 3:0:3
+ liblirc_client_la_SOURCES = lirc_client.c lirc_client.h lirc_log.c lirc_log.h
+@@ -49,6 +50,7 @@
+ serial.c \
+ transmit.c \
+ transmit.h
++liblirc_driver_la_LIBADD = liblirc.la
+
+ dist_include_HEADERS = lirc_client.h \
+ lirc_driver.h \
diff --git a/lirc-no-svgalib.patch b/lirc-no-svgalib.patch
deleted file mode 100644
index dc955ca..0000000
--- a/lirc-no-svgalib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lirc-0.8.3/configure.ac.orig 2008-05-15 11:40:28.000000000 +0200
-+++ lirc-0.8.3/configure.ac 2008-05-15 11:42:34.282299065 +0200
-@@ -49,17 +49,6 @@
- fi
-
- vga_progs=
--AC_CHECK_HEADER(vga.h,
-- [AC_CHECK_HEADER(vgagl.h,
-- [AC_CHECK_LIB(vga, vga_init,
-- [AC_CHECK_LIB(vgagl, gl_setcontextvga,
-- [AC_DEFINE(HAVE_LIBVGA)]
-- vga_progs=smode2,,
-- -lvga
-- )]
-- )]
-- )]
--)
- x_progs="irxevent xmode2"
- AC_PATH_XTRA
- if test "$no_x" = "yes"; then
diff --git a/lirc-opt.patch b/lirc-opt.patch
deleted file mode 100644
index a2cd7c5..0000000
--- a/lirc-opt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lirc-0.8.3/configure.ac.orig 2008-05-04 15:54:15.000000000 +0200
-+++ lirc-0.8.3/configure.ac 2008-05-05 18:37:21.000000000 +0200
-@@ -9,8 +9,6 @@
- AM_INIT_AUTOMAKE(lirc, 0.8.3)
- AM_CONFIG_HEADER(config.h)
-
--CFLAGS="${CFLAGS--O2 -g -Wall}"
--
- dnl Checks for programs.
- AC_PROG_CC
- AM_PROG_CC_C_O
diff --git a/lirc-sparc.patch b/lirc-sparc.patch
deleted file mode 100644
index fe3612d..0000000
--- a/lirc-sparc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- lirc-0.8.3/drivers/lirc_parallel/lirc_parallel.c.orig 2008-05-05 19:17:41.000000000 +0200
-+++ lirc-0.8.3/drivers/lirc_parallel/lirc_parallel.c 2008-05-05 19:17:28.000000000 +0200
-@@ -71,6 +71,14 @@
- #include <linux/io.h>
- #include <linux/signal.h>
- #include <linux/irq.h>
-+
-+#if defined(__sparc__) && defined(enable_irq)
-+# undef enable_irq
-+#endif
-+#if defined(__sparc__) && defined(disable_irq)
-+# undef disable_irq
-+#endif
-+
- #include <linux/uaccess.h>
- #endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
diff --git a/lirc-tmp.patch b/lirc-tmp.patch
index 66a6b81..5b05a92 100644
--- a/lirc-tmp.patch
+++ b/lirc-tmp.patch
@@ -1,22 +1,22 @@
---- lirc-0.8.6/config.h.in.orig 2009-09-13 10:52:17.000000000 +0200
-+++ lirc-0.8.6/config.h.in 2009-09-17 21:06:09.662437650 +0200
-@@ -348,7 +348,7 @@
+--- lirc-0.9.3/lib/lirc_config.h.orig 2015-09-02 21:43:49.000000000 +0200
++++ lirc-0.9.3/lib/lirc_config.h 2015-10-04 20:23:15.392722256 +0200
+@@ -45,7 +45,7 @@
+ #endif /* LIRC_HAVE_DEVFS */
- #define LIRC_IRTTY DEVDIR "/" "ttyS0"
+ /** Complete lircd socket path. */
+-#define LIRCD VARRUNDIR "/" PACKAGE "/" DEV_LIRCD
++#define LIRCD "/tmp/.lircd"
+ /** Complete lircmd socket path. */
+ #define LIRCM VARRUNDIR "/" PACKAGE "/" DEV_LIRCM
--#define LIRCD VARRUNDIR "/" PACKAGE "/" DEV_LIRCD
-+#define LIRCD "/tmp/.lircd"
- #define LIRCM VARRUNDIR "/" PACKAGE "/" DEV_LIRCM
+--- lirc-0.9.3/lib/lirc/lirc_config.h.orig 2015-09-03 13:19:20.000000000 +0200
++++ lirc-0.9.3/lib/lirc/lirc_config.h 2015-10-04 20:23:56.489387202 +0200
+@@ -45,7 +45,7 @@
+ #endif /* LIRC_HAVE_DEVFS */
- #define LIRCDCFGFILE SYSCONFDIR "/" PACKAGE "/" CFG_LIRCD
---- lirc-0.8.6/configure.ac.orig 2009-09-17 21:04:55.172445270 +0200
-+++ lirc-0.8.6/configure.ac 2009-09-17 21:06:45.876392377 +0200
-@@ -1742,7 +1742,7 @@
+ /** Complete lircd socket path. */
+-#define LIRCD VARRUNDIR "/" PACKAGE "/" DEV_LIRCD
++#define LIRCD "/tmp/.lircd"
+ /** Complete lircmd socket path. */
+ #define LIRCM VARRUNDIR "/" PACKAGE "/" DEV_LIRCM
- #define LIRC_IRTTY DEVDIR "/" "ttyS0"
-
--#define LIRCD VARRUNDIR "/" PACKAGE "/" DEV_LIRCD
-+#define LIRCD "/tmp/.lircd"
- #define LIRCM VARRUNDIR "/" PACKAGE "/" DEV_LIRCM
-
- #define LIRCDCFGFILE SYSCONFDIR "/" PACKAGE "/" CFG_LIRCD
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lirc.git/commitdiff/101b5a26b3a230ac2502efdec3005abcfbeb80ca
More information about the pld-cvs-commit
mailing list