From 7722049e5eff21fcc6965d13c87d0fc23aaa2d47 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Sun, 6 Sep 2015 04:44:39 +0200 Subject: [PATCH] New upstream release 0.9.3. --- lirc.spec | 57 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/lirc.spec b/lirc.spec index 7820efd..0fda52f 100644 --- a/lirc.spec +++ b/lirc.spec @@ -4,15 +4,15 @@ %global _hardened_build 1 %global released 1 -#define pre pre3 +%define tag devel Name: lirc -Version: 0.9.2a +Version: 0.9.3 %global src_vers %(echo %{version} | sed 's/_/-/g' ) %if 0%{?released} -Release: 2%{?dist} +Release: 1%{?dist} %else -Release: 2 +Release: 0.4.pre3%{tag} %endif Summary: The Linux Infrared Remote Control package @@ -22,15 +22,15 @@ Group: System Environment/Daemons License: GPLv2 and BSD URL: http://www.lirc.org/ %if 0%{?released} -Source0: http://downloads.sourceforge.net/lirc/%{name}-%{src_vers}.tar.gz +Source0: http://downloads.sourceforge.net/lirc/%{version}/%{name}-%{src_vers}.tar.gz %else -Source0: http://leamas.fedorapeople.org/lirc/lirc-%{src_vers}.tar.gz +Source0: ./lirc-%{src_vers}-%{tag}.tar.gz +#Source0: http://leamas.fedorapeople.org/lirc/lirc-%%{src_vers}.tar.gz %endif Source6: README.fedora Source7: 99-remote-control-lirc.rules # Config only, cannot be upstreamed. Patch1: 0001-Changing-effective-user-default.patch -Patch2: 0002-Use-puts-instead-of-printf-when-applicalble.patch BuildRequires: alsa-lib-devel Buildrequires: autoconf @@ -44,6 +44,7 @@ BuildRequires: libirman-devel BuildRequires: libtool BuildRequires: libusb-devel BuildRequires: libusb1-devel +BuildRequires: libxslt BuildRequires: libXt-devel BuildRequires: portaudio-devel BuildRequires: python3-devel @@ -161,7 +162,6 @@ Udev rule which disables the kernel built-in handling of infrared devices %package tools-gui Summary: LIRC GUI tools Requires: lirc-core%{?_isa} = %{version}-%{release} -Requires: xorg-x11-fonts-misc %description tools-gui Some seldom used X11-based tools for debugging lirc configurations. @@ -212,12 +212,11 @@ full support for the ftdi device. %prep %if 0%{?released} -%setup -q -%else %setup -qn %{name}-%{src_vers} +%else +%setup -qn %{name}-%{src_vers}-%{tag} %endif %patch1 -p1 -%patch2 -p1 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc @@ -230,9 +229,6 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -tar -C $RPM_BUILD_ROOT/%{_pkgdocdir} \ - -xzf $RPM_BUILD_ROOT/%{_pkgdocdir}/api-docs.tar.gz -rm $RPM_BUILD_ROOT/%{_pkgdocdir}/api-docs.tar.gz cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib chmod 755 irman2lirc devinput.sh chmod 755 lirc.debian lirc.redhat lircs lirc.suse* @@ -242,6 +238,8 @@ 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 +install -Dpm 644 contrib/60-lirc.rules \ + $RPM_BUILD_ROOT%{_udevrulesdir}/60-lirc.rules install -Dpm 644 %{SOURCE7} \ $RPM_BUILD_ROOT%{_udevrulesdir}/99-remote-control-lirc.rules cp -a %{SOURCE6} README.fedora @@ -269,21 +267,23 @@ find /etc/systemd -name lirc.service -xtype l -delete || : %systemd_preun lircd.service lircmd.service %postun -%systemd_postun_with_restart lircd.service lircmd.servic - -%files +%systemd_postun_with_restart lircd.service lircmd.service %postun libs -p /sbin/ldconfig + %files compat %files drv-iguanaIR %{_libdir}/lirc/plugins/iguanaIR.so %{_datadir}/lirc/configs/iguanaIR.conf + +%if 0 %files drv-irman %{_libdir}/lirc/plugins/irman.so %{_datadir}/lirc/configs/irman.conf +%endif %files drv-portaudio %{_libdir}/lirc/plugins/audio.so @@ -322,6 +322,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || : %config(noreplace) /etc/lirc/lirc*.conf %{_tmpfilesdir}/lirc.conf %{_unitdir}/lirc* +%{_udevrulesdir}/60-lirc.rules %{_bindir}/*ir* %{_bindir}/*mode2 %exclude %{_bindir}/irdb-get @@ -339,6 +340,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || : %exclude %{_datadir}/lirc/configs/* %{_mandir}/man1/*ir*.1* %{_mandir}/man1/*mode2*.1* +%{_mandir}/man4/lirc.* %{_mandir}/man8/lirc*d.8* %{_mandir}/man5/lircd.conf.* %exclude %{_mandir}/man1/lirc-config-tool* @@ -350,6 +352,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || : %files libs #doc COPYING +%{_libdir}/libirrecord.so.* %{_libdir}/liblirc_client.so.* %{_libdir}/liblirc_driver.so.* %{_libdir}/liblirc.so.* @@ -359,6 +362,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || : %{_includedir}/lirc_private.h %{_includedir}/lirc_driver.h %{_includedir}/lirc_client.h +%{_libdir}/libirrecord.so %{_libdir}/liblirc_client.so %{_libdir}/liblirc_driver.so %{_libdir}/liblirc.so @@ -372,14 +376,25 @@ find /etc/systemd -name lirc.service -xtype l -delete || : %files disable-kernel-rc %{_udevrulesdir}/99-remote-control-lirc.rules - %changelog +* Sat Sep 05 2015 Alec Leamas - 0.9.3-1 +- New upstream version. + +* Wed Aug 19 2015 Alec Leamas - 0.9.3-0.3.pre3 +- Added lirc-lsplugins left-over logfile patch (COPR only). + +* Tue Aug 18 2015 Alec Leamas - 0.9.3-0.2pre3 +- Add new patch for external module compilation (COPR only). + +* Thu Jul 30 2015 Alec Leamas - 0.9.3-0.2pre1 +- Add udev rule to fix /dev/lirc0 permissions (COPR only). + +* Wed Jul 1 2015 Alec Leamas - 0.9.3-0.1pre1 +- Provisionary COPR 0.9.3 pre-release - major upstream update. + * Wed Jun 17 2015 Fedora Release Engineering - 0.9.2a-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Mon Feb 09 2015 Alec Leamas - 0.9.2a-1 -- Updating for new release 0.9.2a, most patches upstreamed. - * Wed Dec 10 2014 Alec Leamas - 0.9.2-1 - Major upstream update. - New package structure with more, smaller packages.