Accepting request 257595 from home:elvigia:branches:vdr
- Run spec-cleaner - Replace xorg-x11-devel with pkgconfig(x11) - Do not run autoreconf, configure.ac is broken and patches are not modifying autotools files. OBS-URL: https://build.opensuse.org/request/show/257595 OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=44
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
93032dc58b
commit
4720e982a0
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 19 00:08:12 UTC 2014 - crrodriguez@opensuse.org
|
||||
|
||||
- Run spec-cleaner
|
||||
- Replace xorg-x11-devel with pkgconfig(x11)
|
||||
- Do not run autoreconf, configure.ac is broken and patches
|
||||
are not modifying autotools files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 21 15:44:05 UTC 2014 - p.drouand@gmail.com
|
||||
|
||||
|
||||
88
lirc.spec
88
lirc.spec
@ -16,58 +16,59 @@
|
||||
#
|
||||
|
||||
|
||||
%define _udevdir %(pkg-config --variable udevdir udev)
|
||||
%if ! %{defined _rundir}
|
||||
%define _rundir %{_localstatedir}/run
|
||||
%endif
|
||||
Name: lirc
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: xorg-x11-devel
|
||||
# for hw_atilibusb driver
|
||||
BuildRequires: libusb-devel
|
||||
%ifnarch s390 s390x
|
||||
# for hw_i2cuser driver
|
||||
BuildRequires: linux-kernel-headers
|
||||
# i2c-dev.h now moved to that package
|
||||
BuildRequires: i2c-tools
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: help2man
|
||||
BuildRequires: systemd
|
||||
Url: http://www.lirc.org/
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: lirc-64bit
|
||||
%endif
|
||||
#
|
||||
Version: 0.9.1a
|
||||
Release: 0
|
||||
Summary: Tools for Infrared Receivers
|
||||
License: GPL-2.0+
|
||||
Group: Hardware/Other
|
||||
Url: http://www.lirc.org/
|
||||
Source0: http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.bz2
|
||||
Source1: baselibs.conf
|
||||
Source6: fix-remote-keys.pl
|
||||
Source8: README.SUSE
|
||||
Source9: 51-lirc.rules
|
||||
# PATCH-FEATURE-UPSTREAM 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch --lircd fails to start ending in a segfault
|
||||
# PATCH-FEATURE-UPSTREAM 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch --lircd fails to start ending in a segfault
|
||||
Patch0: 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
|
||||
# PATCH-FEATURE-UPSTREAM 0002-lircd-Fix-bad-default-for-lircdfile.patch -- Fix bad default for lircdfile
|
||||
Patch1: 0002-lircd-Fix-bad-default-for-lircdfile.patch
|
||||
# PATCH-FEATURE-UPSTREAM 0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch --segfault when parsing
|
||||
# PATCH-FEATURE-UPSTREAM 0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch --segfault when parsing
|
||||
# --connect in config file
|
||||
Patch2: 0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
|
||||
# PATCH-FEATURE-UPSTREAM 0004-lircd-fix-compiler-error-format-security-error.patch --fix compiler error=format-security error
|
||||
Patch3: 0004-lircd-fix-compiler-error-format-security-error.patch
|
||||
# PATCH-FEATURE-UPSTREAM -- lirc config for iMON-PAD remote
|
||||
Patch90: imon2_conf.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: help2man
|
||||
BuildRequires: libtool
|
||||
# for hw_atilibusb driver
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(udev)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
Requires: udev
|
||||
Recommends: lirc-remotes
|
||||
Suggests: lirc-kmp
|
||||
Supplements: lirc-kmp
|
||||
BuildRequires: pkgconfig(udev)
|
||||
%define _udevdir %(pkg-config --variable udevdir udev)
|
||||
%if ! %{defined _rundir}
|
||||
%define _rundir %{_localstatedir}/run
|
||||
%endif
|
||||
%{?systemd_requires}
|
||||
%ifnarch s390 s390x
|
||||
# i2c-dev.h now moved to that package
|
||||
BuildRequires: i2c-tools
|
||||
# for hw_i2cuser driver
|
||||
BuildRequires: linux-kernel-headers
|
||||
%endif
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: lirc-64bit
|
||||
%endif
|
||||
|
||||
%description
|
||||
LIRC is a package that supports receiving and sending IR signals with
|
||||
@ -113,8 +114,8 @@ the 'lirc' package has to be configured and started.
|
||||
%package disable-kernel-rc
|
||||
Summary: Disable kernel ir device handling in favor of lirc
|
||||
Group: Hardware/Other
|
||||
Recommends: lirc = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Recommends: lirc = %{version}
|
||||
|
||||
%description disable-kernel-rc
|
||||
Udev rule which disables the kernel built-in handling of infrared devices
|
||||
@ -125,7 +126,7 @@ Udev rule which disables the kernel built-in handling of infrared devices
|
||||
%global __requires_exclude_from ^%{_docdir}/.*$
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
@ -141,8 +142,7 @@ sed -i 's|run|%{_localstatedir}/run|g' systemd/lircd.socket
|
||||
%endif
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
PYTHON=/usr/bin/python \
|
||||
PYTHON=%{_bindir}/python \
|
||||
CFLAGS="%{optflags} -fno-strict-aliasing" %configure \
|
||||
--with-igor \
|
||||
--with-transmitter \
|
||||
@ -152,25 +152,25 @@ CFLAGS="%{optflags} -fno-strict-aliasing" %configure \
|
||||
--with-syslog
|
||||
# make %%{?_smp_mflags}
|
||||
# parallel makes are currently busted, do single-threaded for now
|
||||
make
|
||||
make
|
||||
chmod -R u+w remotes
|
||||
chmod -R +r remotes
|
||||
rm -rf remotes/*/.xvpics/
|
||||
perl %{SOURCE6} remotes
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
# Put remote definitions in place
|
||||
cp -ar remotes %{buildroot}%{_datadir}/lirc-remotes
|
||||
# Create backward compatibility symlink
|
||||
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
||||
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||
echo "d /var/run/lirc 0755 root root 10d" \
|
||||
> $RPM_BUILD_ROOT/%{_tmpfilesdir}/lirc.conf
|
||||
echo "d %{_localstatedir}/run/lirc 0755 root root 10d" \
|
||||
> %{buildroot}/%{_tmpfilesdir}/lirc.conf
|
||||
#
|
||||
# udev stuff
|
||||
install -d -m 755 %{buildroot}/%_udevdir/rules.d
|
||||
install -m 644 %{SOURCE9} %{buildroot}/%_udevdir/rules.d
|
||||
install -d -m 755 %{buildroot}/%{_udevdir}/rules.d
|
||||
install -m 644 %{SOURCE9} %{buildroot}/%{_udevdir}/rules.d
|
||||
#
|
||||
install -Dpm 644 contrib/99-remote-control-lirc.rules \
|
||||
%{buildroot}%{_udevrulesdir}/99-remote-control-lirc.rules
|
||||
@ -204,12 +204,12 @@ rm -rf %{buildroot}%{_localstatedir}
|
||||
systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
|
||||
# config files moved to /etc/lirc in 0.8.6
|
||||
for file in lircd.conf lircmd.conf lircrc; do
|
||||
if [ -e /etc/$file -a ! -L /etc/$file ]; then
|
||||
if [ ! -e /etc/lirc/$file ]; then
|
||||
mv /etc/$file /etc/lirc/$file || true
|
||||
ln -s lirc/$file /etc/$file || true
|
||||
if [ -e %{_sysconfdir}/$file -a ! -L %{_sysconfdir}/$file ]; then
|
||||
if [ ! -e %{_sysconfdir}/lirc/$file ]; then
|
||||
mv %{_sysconfdir}/$file %{_sysconfdir}/lirc/$file || true
|
||||
ln -s lirc/$file %{_sysconfdir}/$file || true
|
||||
else
|
||||
echo "Warning: lirc ignores /etc/$file, use /etc/lirc/$file instead" >&2
|
||||
echo "Warning: lirc ignores %{_sysconfdir}/$file, use %{_sysconfdir}/lirc/$file instead" >&2
|
||||
fi
|
||||
fi
|
||||
done
|
||||
@ -229,9 +229,9 @@ done
|
||||
%dir %ghost %{_rundir}/lirc
|
||||
%ghost %{_rundir}/lirc/lircm
|
||||
%ghost %{_rundir}/lirc/lircd
|
||||
%attr(0755,root,root)/usr/bin/*
|
||||
%attr(0755,root,root)%{_bindir}/*
|
||||
%{_sbindir}/*
|
||||
%_udevdir/rules.d/51-lirc.rules
|
||||
%{_udevdir}/rules.d/51-lirc.rules
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man8/*
|
||||
%dir %{_sysconfdir}/lirc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user