Hello community, here is the log from the commit of package lirc checked in at Thu May 31 21:05:22 CEST 2007. -------- --- lirc/lirc.changes 2007-04-23 15:12:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/lirc/lirc.changes 2007-05-31 13:35:58.838823000 +0200 @@ -1,0 +2,12 @@ +Thu May 31 13:32:48 CEST 2007 - lnussel@suse.de + +- don't install useless contrib stuff +- add proper ldconfig and insserv calls +- make initscript to automatically install + linux-input-layer-lircd.conf if lircd.conf doesn't exist and + /dev/input/ir is used as device +- add /etc/lircd.conf as %ghost +- don't package /var/run/lirc/lircd +- don't package all remotes to save space + +------------------------------------------------------------------- Old: ---- lirc-0.8.0-k2.6.18.diff remotes.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lirc-kernel.spec ++++++ --- /var/tmp/diff_new_pack.b28441/_old 2007-05-31 21:04:05.000000000 +0200 +++ /var/tmp/diff_new_pack.b28441/_new 2007-05-31 21:04:05.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Kernel Summary: LIRC kernel modules Version: 0.8.1 -Release: 7 +Release: 8 Source0: lirc-0.8.1.tar.bz2 Source1: Makefile.module Source2: Makefile.modsub ++++++ lirc.spec ++++++ --- /var/tmp/diff_new_pack.b28441/_old 2007-05-31 21:04:05.000000000 +0200 +++ /var/tmp/diff_new_pack.b28441/_new 2007-05-31 21:04:05.000000000 +0200 @@ -12,16 +12,18 @@ Name: lirc BuildRequires: alsa-devel xorg-x11-devel +%if %suse_version > 1020 +BuildRequires: fdupes +%endif URL: http://www.lirc.org/ License: GNU General Public License (GPL) Group: Hardware/Other Autoreqprov: on Version: 0.8.1 -Release: 16 +Release: 28 PreReq: %fillup_prereq Summary: Tools for Infrared Receivers Source0: lirc-0.8.1.tar.bz2 -Source1: remotes.tar.bz2 Source4: rc.lirc Source5: sysconfig.lirc Source6: fix-remote-keys.pl @@ -30,10 +32,10 @@ Source9: 51-lirc.rules #Patch0: lirc-hw.diff Patch1: lirc-sockets-in-var.diff -Patch2: lirc-0.8.0-k2.6.18.diff -Patch3: imon2_conf.patch +Patch2: imon2_conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: udev +Suggests: lirc-kmp %description LIRC is a package that supports receiving and sending IR signals with @@ -45,11 +47,10 @@ %prep -%setup -q -a 1 -q +%setup -q #%patch0 -p1 -b .hw %patch1 -p1 -b .var -#%patch2 -%patch3 -p1 +%patch2 -p1 cp %{SOURCE8} . #find . -type d -name CVS -print0 | xargs -0 -- rm -rf #find . -name .cvsignore -print0 | xargs -0 -- rm -rf @@ -86,7 +87,6 @@ cp -a %{SOURCE7} %{buildroot}/usr/share/lirc/remotes install -d -m 755 %{buildroot}/dev mkdir -p %{buildroot}/var/run/lirc -mkfifo %{buildroot}/var/run/lirc/lircd mkfifo %{buildroot}/var/run/lirc/lircm chmod 600 %{buildroot}/var/run/lirc/* # lircd init scripts @@ -106,6 +106,19 @@ install -d -m 755 %{buildroot}/sbin install -m 644 %{SOURCE9} %{buildroot}/etc/udev/rules.d find %{buildroot}/usr/share/lirc -perm +111 -type f -print0 | xargs -r -0 chmod a-x +# +# get rid of libtool file +rm -f %{buildroot}%{_libdir}/liblirc_client.la +# +# get rid of useless contrib stuff +rm contrib/lirc.* +%if %suse_version > 1020 + +%fdupes $RPM_BUILD_ROOT +%endif +# +# ghost file +install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf %files %defattr (-,root,root) @@ -117,7 +130,6 @@ %{_libdir}/liblirc_client.* #%attr (600,root,root) %dev(c,61,0) /dev/lirc # => udev %dir /var/run/lirc -%attr(660,root,video) /var/run/lirc/lircd /var/run/lirc/lircm /usr/bin/* /usr/sbin/* @@ -129,11 +141,29 @@ /etc/udev/rules.d/51-lirc.rules %doc %_mandir/man1/* %doc %_mandir/man8/* +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/lircd.conf %post -%{fillup_only} +%{fillup_and_insserv lirc} +/sbin/ldconfig + +%postun +%{insserv_cleanup} +/sbin/ldconfig + +%clean +rm -rf %{buildroot} %changelog +* Thu May 31 2007 - lnussel@suse.de +- don't install useless contrib stuff +- add proper ldconfig and insserv calls +- make initscript to automatically install + linux-input-layer-lircd.conf if lircd.conf doesn't exist and + /dev/input/ir is used as device +- add /etc/lircd.conf as %%ghost +- don't package /var/run/lirc/lircd +- don't package all remotes to save space * Mon Apr 23 2007 - hvogel@suse.de - Add config for imon2 driver with missing keys and pad2key addidtion from M. Brakemeier ++++++ rc.lirc ++++++ --- lirc/rc.lirc 2006-02-08 15:32:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/lirc/rc.lirc 2007-05-31 12:21:23.000000000 +0200 @@ -113,12 +113,6 @@ case "$1" in start) echo -n "Starting lircd " - if [ ! -e /etc/lircd.conf ]; then - echo -n "Error: please create /etc/lircd.conf" - rc_failed 6 - rc_status -v - rc_exit - fi modinfo evdev > /dev/null 2>&1 && modprobe evdev || : if test "$LIRC_MODULE" != ""; then modprobe "$LIRC_MODULE" @@ -130,9 +124,19 @@ rc_status -v rc_exit fi + if [ ! -e /etc/lircd.conf ]; then + if [ "$LIRCD_DEVICE" = "/dev/input/ir" -a -e "$LIRCD_DEVICE" ]; then + install -m 644 /usr/share/lirc/remotes/linux-input-layer-lircd.conf /etc/lircd.conf + else + echo -n "Error: please create /etc/lircd.conf" + rc_failed 6 + rc_status -v + rc_exit + fi + fi [ -n "$LIRCD_DEVICE" ] && echo -n "($LIRCD_DEVICE)" + install -m "$LIRCD_DEV_PERMISSIONS" /dev/null /var/run/lirc/lircd chown "$LIRCD_DEV_OWNER" /var/run/lirc/lircd - chmod "$LIRCD_DEV_PERMISSIONS" /var/run/lirc/lircd if [ ! -L /dev/lircd ]; then rm -f /dev/lircd ln -s /var/run/lirc/lircd /dev/lircd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org