From 81953037aec33a7efe7b1e3d867f2635db85dd38 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Thu, 26 May 2016 17:21:54 +0200 Subject: [PATCH] New usptream release 0.9.4. --- .gitignore | 1 + ...crash-when-invoked-without-arguments.patch | 34 --------- 0003-lib-Fix-missing-lirc-flag.patch | 24 ------- ...-Make-the-list-devices-support-avail.patch | 28 ++++++++ lirc.spec | 70 ++++++------------- sources | 2 +- 6 files changed, 51 insertions(+), 108 deletions(-) delete mode 100644 0002-irrecord-Fix-crash-when-invoked-without-arguments.patch delete mode 100644 0003-lib-Fix-missing-lirc-flag.patch create mode 100644 0008-plugins-devinput-Make-the-list-devices-support-avail.patch diff --git a/.gitignore b/.gitignore index 5501dec..c002699 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ lirc-0.8.7pre2.tar.bz2 /lirc-0.9.2a.tar.gz /lirc-0.9.3.tar.gz /lirc-0.9.3a.tar.gz +/lirc-0.9.4.tar.gz diff --git a/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch b/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch deleted file mode 100644 index be86091..0000000 --- a/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 26d12ba3dff355e5dbc8dbee0e3965a98ce0dc67 Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Wed, 9 Sep 2015 14:06:21 +0200 -Subject: [PATCH] irrecord: Fix crash when invoked without arguments. - ---- - tools/irrecord-ui.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/irrecord-ui.cpp b/tools/irrecord-ui.cpp -index bc58651..249ab87 100644 ---- a/tools/irrecord-ui.cpp -+++ b/tools/irrecord-ui.cpp -@@ -287,6 +287,7 @@ static void get_commandline(int argc, char** argv, char* buff, size_t size) - int i; - int j; - unsigned int dest = 0; -+ buff[0] = '\0'; - - if (size == 0) - return; -@@ -300,7 +301,8 @@ static void get_commandline(int argc, char** argv, char* buff, size_t size) - break; - buff[dest++] = ' '; - } -- buff[--dest] = '\0'; -+ if (dest > 0) -+ buff[--dest] = '\0'; - } - - --- -2.4.2 - diff --git a/0003-lib-Fix-missing-lirc-flag.patch b/0003-lib-Fix-missing-lirc-flag.patch deleted file mode 100644 index cf0544f..0000000 --- a/0003-lib-Fix-missing-lirc-flag.patch +++ /dev/null @@ -1,24 +0,0 @@ -From dffeb373e2116d3486169872116fd0b2dd39885a Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Wed, 9 Sep 2015 14:24:30 +0200 -Subject: [PATCH] lib: Fix missing --lirc flag. - ---- - lib/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 9e14641..4f9435a 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -30,6 +30,7 @@ liblirc_la_SOURCES = config_file.c \ - transmit.c \ - util.c - -+libirrecord_la_LDFLAGS = -llirc - libirrecord_la_SOURCES = irrecord.c - - liblirc_client_la_LDFLAGS = -version-info 3:0:3 --- -2.4.2 - diff --git a/0008-plugins-devinput-Make-the-list-devices-support-avail.patch b/0008-plugins-devinput-Make-the-list-devices-support-avail.patch new file mode 100644 index 0000000..60854d4 --- /dev/null +++ b/0008-plugins-devinput-Make-the-list-devices-support-avail.patch @@ -0,0 +1,28 @@ +From f1c2f41a04589e019973e06e446205a9a4bfea9f Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Tue, 24 May 2016 21:55:06 +0200 +Subject: [PATCH] plugins/devinput: Make the list-devices support available. + +--- + plugins/devinput.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugins/devinput.c b/plugins/devinput.c +index df97ffd..25b21ae 100644 +--- a/plugins/devinput.c ++++ b/plugins/devinput.c +@@ -89,7 +89,11 @@ const struct driver hw_devinput = { + .api_version = 4, + .driver_version = "0.9.3", + .info = "See file://" PLUGINDOCS "/devinput.html", ++#ifdef HAVE_LIBUDEV_H ++ .device_hint = "drvctl", ++#else + .device_hint = "/dev/input/event*", ++#endif + }; + + +-- +2.5.5 + diff --git a/lirc.spec b/lirc.spec index 0d284a1..79b8a41 100644 --- a/lirc.spec +++ b/lirc.spec @@ -4,8 +4,8 @@ #define tag devel Name: lirc -Version: 0.9.3a -Release: 5%{?tag:.}%{?tag}%{?dist} +Version: 0.9.4 +Release: %{?tag:0.}2%{?tag:.}%{?tag}%{?dist} Summary: The Linux Infrared Remote Control package %global repo http://downloads.sourceforge.net/lirc/LIRC/%{version}/ @@ -19,17 +19,16 @@ Source1: README.fedora Source2: 99-remote-control-lirc.rules # Config only, cannot be upstreamed. Patch1: 0001-Changing-effective-user-default.patch +Patch2: 0008-plugins-devinput-Make-the-list-devices-support-avail.patch BuildRequires: alsa-lib-devel Buildrequires: autoconf BuildRequires: automake BuildRequires: checkpolicy BuildRequires: doxygen -BuildRequires: iguanaIR-devel BuildRequires: kernel-headers BuildRequires: man2html BuildRequires: libftdi-devel -BuildRequires: libirman-devel BuildRequires: libtool BuildRequires: libusb-devel BuildRequires: libusb1-devel @@ -80,9 +79,7 @@ Provides: lirc = %{version}-%{release} Requires: lirc-core%{?_isa} = %{version}-%{release} Requires: lirc-config = %{version}-%{release} Requires: lirc-tools-gui%{?_isa} = %{version}-%{release} -Requires: lirc-drv-iguanaIR%{?_isa} = %{version}-%{release} Requires: lirc-drv-portaudio%{?_isa} = %{version}-%{release} -Requires: lirc-drv-irman%{?_isa} = %{version}-%{release} Requires: lirc-drv-ftdi%{?_isa} = %{version}-%{release} %description compat @@ -110,7 +107,7 @@ Requires: gnome-icon-theme BuildArch: noarch %description config -The LIRC config package contains tools and data to ease the +The LIRC config package contains tools and data to support the LIRC configuration process. @@ -160,16 +157,6 @@ Requires: lirc-core%{?_isa} = %{version}-%{release} Some seldom used X11-based tools for debugging lirc configurations. -%package drv-iguanaIR -Summary: IguanaIR LIRC User-Space Driver -Requires: lirc-core%{?_isa} = %{version}-%{release} -License: LGPLv2 - -%description drv-iguanaIR -LIRC user-space driver which works together with the low-level iguanaIR -package, providing full-fledged support for the iguanaIR devices. - - %package drv-portaudio Summary: Portaudio LIRC User-Space Driver Requires: lirc-core%{?_isa} = %{version}-%{release} @@ -180,15 +167,6 @@ LIRC user space driver which supports a IR receiver in microphone input using the portaudio library. -%package drv-irman -Summary: Irman LIRC User-Space Driver -Requires: lirc-core%{?_isa} = %{version}-%{release} - -%description drv-irman -LIRC user-space driver which works together with the kernel, providing -full support for the irman device. - - %package drv-ftdi Summary: Ftdi LIRC User-Space Driver Requires: lirc-core%{?_isa} = %{version}-%{release} @@ -204,10 +182,9 @@ full support for the ftdi device. %prep -%setup -qn %{name}-%{version}%{?tag:-}%{?tag} +%setup -qn %{name}-%{version}%{?tag} %patch1 -p1 -sed -i -e 's|gtk-go-forward<|gtk-go-forward-ltr<|g' \ - tools/lirc-setup/lirc-setup.ui +%patch2 -p1 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc @@ -217,16 +194,13 @@ autoreconf -fi CFLAGS="%{optflags}" %configure --libdir=%{_libdir} make %{?_smp_mflags} - - %install make install DESTDIR=$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib -chmod 755 irman2lirc devinput.sh -rm -f lirc.debian lirc.redhat lircs lirc.suse* +chmod 755 irman2lirc cd $OLDPWD -find $RPM_BUILD_ROOT%{_libdir} -name \*.la -delete -rm -f $RPM_BUILD_ROOT%{_mandir}/man4/lirc.* +rm $RPM_BUILD_ROOT%{_libdir}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir} install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb @@ -269,15 +243,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf %files compat -%files drv-iguanaIR -%{_libdir}/lirc/plugins/iguanaIR.so -%{_datadir}/lirc/configs/iguanaIR.conf - - -%files drv-irman -%{_libdir}/lirc/plugins/irman.so -%{_datadir}/lirc/configs/irman.conf - %files drv-portaudio %{_libdir}/lirc/plugins/audio.so %{_datadir}/lirc/configs/audio.conf @@ -301,8 +266,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf %{_mandir}/man1/lirc-setup* %{_datadir}/lirc/configs/* %{python3_sitelib}/lirc -%exclude %{_datadir}/lirc/configs/iguanaIR.conf -%exclude %{_datadir}/lirc/configs/irman.conf %exclude %{_datadir}/lirc/configs/ftdi.conf %exclude %{_datadir}/lirc/configs/audio.conf @@ -313,8 +276,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf %dir /etc/lirc /etc/lirc/lircd.conf.d %config(noreplace) /etc/lirc/lirc*.conf +%config(noreplace) /etc/lirc/irexec.lircrc %{_tmpfilesdir}/lirc.conf %{_unitdir}/lirc* +%{_unitdir}/irexec.service %{_udevrulesdir}/60-lirc.rules %{_bindir}/*ir* %{_bindir}/*mode2 @@ -325,16 +290,19 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf %exclude %{_bindir}/lirc-config-tool %{_sbindir}/lirc* %{_libdir}/lirc/plugins -%exclude %{_libdir}/lirc/plugins/iguanaIR.so -%exclude %{_libdir}/lirc/plugins/irman.so %exclude %{_libdir}/lirc/plugins/ftdi.so %exclude %{_libdir}/lirc/plugins/audio.so %{_datadir}/lirc/ +/var/lib/lirc/images +/var/lib/lirc/plugins %exclude %{_datadir}/lirc/configs/* %{_mandir}/man1/*ir*.1* %{_mandir}/man1/*mode2*.1* -%{_mandir}/man8/lirc*d.8* %{_mandir}/man5/lircd.conf.* +%{_mandir}/man5/lircrc.* +%{_mandir}/man8/lirc*d.8* +%{_mandir}/man8/lircd-setup.8* +%{_mandir}/man8/lircd-uinput.8* %exclude %{_mandir}/man1/lirc-config-tool* %exclude %{_mandir}/man1/irdb-get* %exclude %{_mandir}/man1/lirc-setup* @@ -369,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf %{_udevrulesdir}/99-remote-control-lirc.rules %changelog +* Thu May 26 2016 Alec Leamas - 0.9.4-2 +- New upstream release. + * Thu May 12 2016 Alec Leamas - 0.9.3a-5 - Fix upstreamed/duplicated lirc.4 manpage (#1319344). @@ -387,6 +358,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf - Some patches upstreamed. * Mon Sep 14 2015 Alec Leamas 0.9.3-6 +- Add a selinux policy. - Clean up some macros. * Wed Sep 09 2015 Alec Leamas - 0.9.3-5 diff --git a/sources b/sources index f28e510..f50743a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05627803238dedcba1225506b7143f69 lirc-0.9.3a.tar.gz +eb7d324ea9a7acce4892e32cedae1f2c lirc-0.9.4.tar.gz