Accepting request 647390 from vdr

OBS-URL: https://build.opensuse.org/request/show/647390
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lirc?expand=0&rev=68

lirc-0.9.4c.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8974fe5dc8eaa717daab6785d2aefeec27615f01ec24b96d31e3381b2f70726a
-size 2311300

lirc-configure-libudev.patch

@@ -1,23 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,7 +48,7 @@
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_TIME
--AC_CHECK_HEADERS([fcntl.h limits.h poll.h sys/ioctl.h sys/poll.h sys/time.h ])
-+AC_CHECK_HEADERS([fcntl.h libudev.h limits.h poll.h sys/ioctl.h sys/poll.h sys/time.h ])
- AC_CHECK_HEADERS([syslog.h unistd.h util.h libutil.h pty.h])
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
-@@ -390,6 +390,10 @@
-     AC_DEFINE(HAVE_SYSTEMD)
- fi
- 
-+PKG_CHECK_MODULES([LIBUDEV],[libudev],,[true])
-+CFLAGS="$CFLAGS $LIBUDEV_CFLAGS"
-+LIBS="$LIBS $LIBUDEV_LIBS"
-+
- dnl Ubuntu's systemd pkg-config seems broken beyond repair. So:
- kernelversion=`cat /proc/version || echo "non-linux"`
- case $kernelversion in
-

lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch

@@ -1,35 +0,0 @@
-From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 25 Oct 2016 10:28:14 +0200
-Subject: [PATCH 05/10] lib: curl_poll.h: Ensure build on unconfiguredclients.
-
----
- lib/curl_poll.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/curl_poll.h b/lib/curl_poll.h
-index 6144c42..af25381 100644
---- a/lib/curl_poll.h
-+++ b/lib/curl_poll.h
-@@ -21,7 +21,9 @@
-  * KIND, either express or implied.
-  *
-  ***************************************************************************/
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -29,7 +31,7 @@ extern "C" {
- 
- #ifdef HAVE_SYS_POLL_H
- #include <sys/poll.h>
--#elif defined(HAVE_POLL_H)
-+#else
- #include <poll.h>
- #endif
- 
--- 
-2.5.5
-

lirc.changes

@@ -1,3 +1,91 @@
+-------------------------------------------------------------------
+Tue Oct 30 07:53:39 UTC 2018 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 0.10.1
+  * mode2: Fix inconsistent loglevel/debug option (#307).
+  * build: install media/lirc.h (Debian BTS #872074).
+  * build: Fix make "always build all" error - c6eb8ec.
+  * plugins: devinput: Fix glob "no match" error - 14685b2.
+  version 0.10.0
+  * lib/curl_poll.h: Fix header guard build error on müsl libc.
+  * Build: Mute libtool when V=0, typo.
+  * Update driver version info.
+  version 0.10.0-rc3
+  * lircmd: Fix bogus, excessive logging using --uinput (#295).
+  * Build: VPATH fixes (#294).
+  * Build: kfreebsd debian builds fixes.
+  * python tests: Portability fixes for in python-pkg/test.
+  * Unit tests in test/ dir: Portability fixes and some docs.
+  version 0.10.0-rc2
+  * Fixed lirc-setup fail-on-start (#290).
+  * Make python unit tests work on Debian (#289).
+  * Fix mode2 config file parsing [292].
+  * Documentation update.
+  * Build fixes.
+  version 0.10.0rc1
+  * ftdi driver: Fix off-by-2 timings (#275). This is a breaking
+    change, see ftdi driver docs or source at doc/plugins/ftdi.html.
+  * doc: The lirc.hwdb parsable driver list is deprecated - use
+    the python database or the configs/*.yaml files instead.
+  * lircd: the deprecated --uinput option is dropped. Use
+    the lircd-uinput(8) daemon instead.
+  * lircd: The --release option is deprecated.
+  * lircd: Adding a --immediate-init option which initiates
+    the hardware directly on start and exits on errors.
+  * lircd, lircd-uinput: Change default release suffix due to linux
+    kernel changes (#263).
+  * plugins: The slinke (a. k. a. slink-e) driver is dropped.
+  * plugins: Add support for irdroid in the irtoy driver.
+  * plugins: Enhanced device enumeration, mode2 --list-devices
+    works for most drivers.
+  * plugins: devinput driver: Fix bad codelength (#263).
+  * New, shiny (i. e., unstable) python API. See the API docs,
+    module "python bindings". The API is also available as a pypi
+    package, typically at /usr/share/lirc/python-pkg
+  * lircd-uinput: Multiple config file parsing errors (#284).
+  * lib: Added enumeration support and server version level check
+    to driver API.
+  * irrecord: Add --driver-options for lircd symmetry (#277).
+  * lircd: Fix devices not connected at first attempt (#279).
+  * lib: Fix failure when parsing absolute paths config files (#281).
+  * lircd/irsend: Fix bug when sending/receiving concurrently for
+    some remotes (#278, 5 pages!)
+  * lircd:Fix missing systemd support due to upstream changes (#274).
+  * The configs/*conf files no more supports  enumerating devices
+    using shell scripts.
+  * Build: Added new configure --enable-devinput option (#264).
+  * Build: Added new configure --enable-uinput option, ditched
+    the HAVE_UINPUT 0.9.4c kludge.
+  * Build: More quiet, enhanced V=0/V=1 support.
+  * Build: OSX patches(#273)
+  version 0.9.4d
+  * The debian packaging means that freebsd and hurd builds are
+    regularly tested, improving build stability.
+  * A multitude of build patches, mostly after building on Debian:
+    + Cross-compilation FTBS fixed (#233)
+    + Fix configuration of configure (#234)
+    + Fix library specification in lirc.pc (#236)
+    + use HAVE_UINPUT=1 to force building uinput code (#238).
+    + lib: Only use local headers in lirc_private.h (#237).
+    + Configure libudev (#242)
+    + Various kfreebsd fixes
+    + Include config.h in installed headers (#250).
+    + Fix _XOPEN_SOURCE related FTBS on some platforms (#248)
+  * lib: Fix some lircrcd-related bugs (#254)
+  * systemd: Fix wrong path to irexec (#239)
+  * systemd: Add missing lircd-setup.service to distribution (#243)
+  * lircd: Fix --listen option parsing [#249]
+  * lircd: Fix segfault in SET_INPUTLOG without arguments (#252)
+  * lircd: Fix DRV_OPTION error message handling (#256).
+  * ircat: Fix option parsing bug + empty conditions (#251)
+  * xmode2: Fix handling of --driver option.
+
+- Dropped
+  lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+  and lirc-configure-libudev.patch (merged upstream)
+
+- Spec cleanup
+
 -------------------------------------------------------------------
 Tue Apr 24 14:08:21 CEST 2018 - jdelvare@suse.de
 

lirc.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,30 +21,29 @@
 %define _rundir %{_localstatedir}/run
 %endif
 Name:           lirc
-#
+Version:        0.10.1
-Version:        0.9.4c
 Release:        0
 Summary:        Tools for Infrared Receivers
 License:        GPL-2.0-or-later
 Group:          Hardware/Other
-Url:            http://www.lirc.org/
+URL:            http://www.lirc.org/
-Source0:        http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.bz2
+Source0:        https://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.bz2
 Source1:        baselibs.conf
-Patch1:         lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
-Patch2:         lirc-configure-libudev.patch
-BuildRequires:  autoconf
-BuildRequires:  autogen
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  kmod-compat
-BuildRequires:  libtool
 BuildRequires:  libxslt-tools
 # for hw_atilibusb driver
 BuildRequires:  pkgconfig
 BuildRequires:  python3
 BuildRequires:  python3-PyYAML
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(libftdi1)
+BuildRequires:  pkgconfig(libirman)
+BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libusb)
 BuildRequires:  pkgconfig(portaudio-2.0)
 BuildRequires:  pkgconfig(sm)
@@ -55,11 +54,6 @@ Requires:       udev
 Recommends:     lirc-remotes
 Suggests:       lirc-kmp
 Supplements:    lirc-kmp
-%if 0%{?suse_version} > 1320
-BuildRequires:  pkgconfig(libftdi1)
-BuildRequires:  pkgconfig(libirman)
-BuildRequires:  pkgconfig(libudev)
-%endif
 %ifnarch s390 s390x
 # for hw_i2cuser driver
 BuildRequires:  linux-kernel-headers
@@ -161,7 +155,6 @@ Recommends:     lirc-core = %{version}
 Udev rule which disables the kernel built-in handling of infrared devices
 (i. e., rc* ones) by making lirc the only used protocol.
 
-%if 0%{?suse_version} > 1320
 %package        drv-ftdi
 Summary:        Ftdi LIRC User-Space Driver
 License:        GPL-2.0-or-later
@@ -171,7 +164,6 @@ Requires:       lirc-core = %{version}
 %description    drv-ftdi
 LIRC user-space driver which works together with the kernel, providing
 full support for the ftdi device.
-%endif
 
 %package        drv-portaudio
 Summary:        Portaudio LIRC User-Space Driver
@@ -199,20 +191,16 @@ Some seldom used X11-based tools for debugging lirc configurations.
 %global __provides_exclude_from ^%{_docdir}/.*$
 %global __requires_exclude_from ^%{_docdir}/.*$
 
-sed -i -e 's|%{_prefix}/local%{_sysconfdir}/|%{_sysconfdir}/|' contrib/irman2lirc
+sed -i -e 's|/usr/local/etc/|%{_sysconfdir}/|' contrib/irman2lirc
 sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
 sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
-%patch1 -p1
-%patch2 -p1
 
 %build
-# Run autogen; required by lirc-configure-libudev.patch, as it touches configure script
+%configure --enable-devinput
-NOCONFIGURE=1 ./autogen.sh
-%configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 chmod a+x %{buildroot}%{_bindir}/pronto2lirc
 # Create backward compatibility symlink
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}d
@@ -229,7 +217,7 @@ install -Dpm 644 contrib/60-lirc.rules \
 install -Dpm 644 contrib/99-remote-control-lirc.rules \
     %{buildroot}%{_udevrulesdir}/99-remote-control-lirc.rules
 # get rid of libtool file
-find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
+find %{buildroot} -type f -name "*.la" -delete -print
 #
 #
 # Don't install documentation in a non standard directory
@@ -237,7 +225,7 @@ rm -rf %{buildroot}%{_datadir}/doc
 # hide python dependency
 chmod a+x %{buildroot}%{_bindir}/pronto2lirc
 mkdir -p %{buildroot}%{_rundir}
-# Remove old %{_rundir}; depreciated but still installed by lirc, which is not looking for it
+# Remove old %%{_rundir}; deprecated but still installed by lirc, which is not looking for it
 rm -rf %{buildroot}%{_localstatedir}
 # Remove contrib folder; we will copy it into doc directory
 rm -rf %{buildroot}%{_datadir}/lirc/contrib
@@ -245,6 +233,8 @@ rm -rf %{buildroot}%{_datadir}/lirc/contrib
 rm -rf %{buildroot}%{_datadir}/lirc/plugindocs
 #
 rm -rf contrib/.release-process.txt.swp
+# remove sources
+rm -rf %{buildroot}/%{_datadir}/lirc/lirc-%{version}.tar.gz %{buildroot}/%{_datadir}/lirc/python-pkg
 %fdupes -s %{buildroot}
 %fdupes -s .
 
@@ -252,12 +242,10 @@ rm -rf contrib/.release-process.txt.swp
 %post -n liblirc_driver0 -p /sbin/ldconfig
 %post -n liblirc0 -p /sbin/ldconfig
 %post -n libirrecord0 -p /sbin/ldconfig
-
 %postun -n liblirc_client0 -p /sbin/ldconfig
 %postun -n liblirc_driver0 -p /sbin/ldconfig
 %postun -n liblirc0 -p /sbin/ldconfig
 %postun -n libirrecord0 -p /sbin/ldconfig
-
 %pre core
 getent group lirc >/dev/null || groupadd -r lirc
 getent passwd lirc >/dev/null || \
@@ -270,11 +258,7 @@ usermod -a -G input lirc &> /dev/null || :
 
 %post core
 %service_add_post lircd.service lircmd.service lircd-uinput.service lircd.socket irexec.service
-%if 0%{?suse_version} <= 1320
+%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
-    systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || :
-%else
-    %tmpfiles_create %{_tmpfilesdir}/%{name}.conf
-%endif
 
 %preun core
 %service_del_preun lircd.service lircmd.service lircd-uinput.service lircd.socket irexec.service
@@ -283,7 +267,6 @@ usermod -a -G input lirc &> /dev/null || :
 %service_del_postun lircd.service lircmd.service lircd-uinput.service lircd.socket irexec.service
 
 %files core
-%defattr (-,root,root)
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README
 %doc doc/html doc/lirc.hwdb doc/irxevent.keys
@@ -309,7 +292,7 @@ usermod -a -G input lirc &> /dev/null || :
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-%{python3_sitelib}/*
+%{python3_sitearch}/*
 %dir %{_sysconfdir}/%{name}
 %config(noreplace,missingok) %{_sysconfdir}/lirc/lircd.conf
 %config(noreplace,missingok) %{_sysconfdir}/lirc/lircmd.conf
@@ -322,7 +305,6 @@ usermod -a -G input lirc &> /dev/null || :
 %{_tmpfilesdir}/lirc.conf
 
 %files devel
-%defattr (-,root,root)
 %dir %{_includedir}/lirc
 %{_includedir}/lirc/*
 %{_includedir}/lirc_client.h
@@ -336,50 +318,37 @@ usermod -a -G input lirc &> /dev/null || :
 %{_libdir}/pkgconfig/lirc.pc
 
 %files drv-portaudio
-%defattr (-,root,root)
 %{_libdir}/lirc/plugins/audio.so
 %{_datadir}/lirc/configs/audio.conf
 
-%if 0%{?suse_version} > 1320
 %files drv-ftdi
-%defattr (-,root,root)
 %{_libdir}/lirc/plugins/ftdi.so
 %{_datadir}/lirc/configs/ftdi.conf
-%endif
 
 %files config
-%defattr (-,root,root)
 %{_datadir}/lirc/configs
-%if 0%{?suse_version} > 1320
 %exclude %{_datadir}/lirc/configs/ftdi.conf
-%endif
 %exclude %{_datadir}/lirc/configs/audio.conf
 
 %files -n liblirc0
-%defattr (-,root,root)
 %{_libdir}/liblirc.so.*
 
 %files -n liblirc_client0
-%defattr (-,root,root)
 %{_libdir}/liblirc_client.so.*
 
 %files -n liblirc_driver0
-%defattr (-,root,root)
 %{_libdir}/liblirc_driver.so.*
 
 %files -n libirrecord0
-%defattr (-,root,root)
 %{_libdir}/libirrecord.so.*
 
 %files disable-kernel-rc
-%defattr (-,root,root)
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %files tools-gui
-%defattr (-,root,root)
 %{_bindir}/xmode2
 %{_bindir}/irxevent
 %{_mandir}/man1/irxevent*
-%{_mandir}/man1/xmode2*
+%{_mandir}/man1/xmode2.1%{?ext_man}
 
 %changelog