Merge branch 'master' into f15

lirc.spec

@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        2%{?dist}
+Release:        3%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -222,11 +222,18 @@ rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/lirc
-touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lirc{d,md}.conf
+for f in lircd.conf lircmd.conf
+do
+  echo "# Populated config files can be found in the lirc-remotes sub-package
+# or at http://lirc.sourceforge.net/remotes/" > $RPM_BUILD_ROOT%{_sysconfdir}/lirc/$f
+done
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/lirc{d,m}
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+echo "d	%{_localstatedir}/run/lirc	0755	root	root	10d" > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/lirc.conf
+
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
 
 # Put remote definitions in place
@@ -262,18 +269,19 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
-%ghost %config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
+%config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/lirc.conf
 %{_initrddir}/lirc
 %{_bindir}/*ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %dir %{_datadir}/lirc/
 %{_datadir}/lirc/
-%dir %{_localstatedir}/run/lirc/
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
+%ghost %dir %{_localstatedir}/run/lirc/
 %ghost %{_localstatedir}/run/lirc/lirc*
 
 %files libs
@@ -297,6 +305,10 @@ fi
 
 
 %changelog
+* Tue May 03 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-3
+- Properly support tmpfs /var/run/lirc in new systemd world (#656613)
+- Don't ghost config files, lay 'em down with pointers in them
+
 * Tue May 03 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-2
 - Only disable in-kernel IR decoders if we're not using devinput mode,
   as they're actually required for devinput mode to work right.