From 9dcfbab0d156e70b18adeb9f594eecb7fec75d1a4efbd207fd7f2d6a587bbf9f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 5 May 2010 20:12:10 +0000 Subject: [PATCH] Accepting request 39385 from Base:System Copy from Base:System/lirc based on submit request 39385 from user lnussel OBS-URL: https://build.opensuse.org/request/show/39385 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lirc?expand=0&rev=32 --- lirc.changes | 6 ++++++ lirc.spec | 33 ++++++++++----------------------- rc.lirc | 3 ++- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/lirc.changes b/lirc.changes index 9e8a711..af8b835 100644 --- a/lirc.changes +++ b/lirc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 4 08:16:15 UTC 2010 - lnussel@suse.de + +- don't package files in /var/run +- fix package descriptions + ------------------------------------------------------------------- Fri Mar 12 14:58:11 UTC 2010 - lnussel@suse.de diff --git a/lirc.spec b/lirc.spec index eac4576..a9cdb13 100644 --- a/lirc.spec +++ b/lirc.spec @@ -51,7 +51,7 @@ Obsoletes: lirc-64bit Version: 0.8.6%{?snapshot:_%snapshot} Release: 1 PreReq: %fillup_prereq %insserv_prereq -Summary: LIRC remote definitions +Summary: Tools for Infrared Receivers Source0: http://downloads.sourceforge.net/project/lirc/LIRC/%version/lirc-%{?snapshot}%{!?snapshot:%version}.tar.bz2 Source1: baselibs.conf Source4: rc.lirc @@ -75,15 +75,13 @@ and sends IR signals, a mouse daemon that translates IR signals to mouse movements, and a couple of user programs that allow you to control your computer with a remote control. -This package contains a collection of configuration files for various -remotes. %package devel License: GPLv2+ Summary: LIRC development files -Group: Hardware/Other +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} # files were in lirc package previously Conflicts: lirc <= 0.8.4 @@ -99,18 +97,13 @@ control your computer with a remote control. %package remotes License: GPLv2+ -Summary: Tools for Infrared Receivers +Summary: LIRC remote definitions Group: Hardware/Other # files were in lirc package previously Conflicts: lirc <= 0.8.4 %description remotes -LIRC is a package that supports receiving and sending IR signals with -the most common IR remote controls. It contains a daemon that decodes -and sends IR signals, a mouse daemon that translates IR signals to -mouse movements, and a couple of user programs that allow you to -control your computer with a remote control. - +Collection of LIRC configuration files for various remotes. %package -n liblirc_client0 @@ -122,15 +115,8 @@ Recommends: lirc = %{version} Conflicts: lirc <= 0.8.4 %description -n liblirc_client0 -LIRC is a package that supports receiving and sending IR signals with -the most common IR remote controls. It contains a daemon that decodes -and sends IR signals, a mouse daemon that translates IR signals to -mouse movements, and a couple of user programs that allow you to -control your computer with a remote control. - -This package only contains the client library. To actually use LIRC the -lircd daemon from the 'lirc' package has to be configured and started. - +The LIRC client library. To actually use LIRC the lircd daemon from +the 'lirc' package has to be configured and started. %prep @@ -177,6 +163,7 @@ mkdir -p %{buildroot}/usr/share/lirc cp -a remotes %{buildroot}/usr/share/lirc install -d -m 755 %{buildroot}/dev mkdir -p %{buildroot}/var/run/lirc +touch %{buildroot}/var/run/lirc/lircd chmod 600 %{buildroot}/var/run/lirc/* # lircd init scripts install -d -m 755 %{buildroot}/etc/init.d \ @@ -216,9 +203,9 @@ chmod 644 %{buildroot}%{_bindir}/pronto2lirc %doc README.SUSE %doc doc/html doc/images doc/lirc.hwdb doc/lirc.css doc/irxevent.keys %doc contrib -#%attr (600,root,root) %dev(c,61,0) /dev/lirc # => udev -%dir /var/run/lirc -/var/run/lirc/lircm +%dir %ghost /var/run/lirc +%ghost /var/run/lirc/lircm +%ghost /var/run/lirc/lircd %attr(0755,root,root)/usr/bin/* /usr/sbin/* /etc/init.d/lirc diff --git a/rc.lirc b/rc.lirc index d2a4958..bfb1080 100644 --- a/rc.lirc +++ b/rc.lirc @@ -93,8 +93,9 @@ case "$1" in fi fi [ -n "$LIRCD_DEVICE" ] && echo -n "($LIRCD_DEVICE)" + install -d -m 755 /var/run/lirc install -m "$LIRCD_DEV_PERMISSIONS" /dev/null /var/run/lirc/lircd - chown "$LIRCD_DEV_OWNER" /var/run/lirc/lircd + chown "$LIRCD_DEV_OWNER" /var/run/lirc/lircd if [ ! -L /dev/lircd ]; then rm -f /dev/lircd ln -s /var/run/lirc/lircd /dev/lircd