packages: lirc/lirc.spec - realy update to 0.8.6 (see NEWS) - rel. 8 (for t...

[charles]

Author: charles                      Date: Sat Dec  5 15:29:59 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- realy update to 0.8.6 (see NEWS)
- rel. 8 (for triggerpostun)

---- Files affected:
packages/lirc:
   lirc.spec (1.219 -> 1.220) 

---- Diffs:

================================================================
Index: packages/lirc/lirc.spec
diff -u packages/lirc/lirc.spec:1.219 packages/lirc/lirc.spec:1.220
--- packages/lirc/lirc.spec:1.219	Sun Nov 22 21:58:07 2009
+++ packages/lirc/lirc.spec	Sat Dec  5 16:29:53 2009
@@ -20,7 +20,7 @@
 %endif
 
 %define		pname	lirc
-%define		rel	7
+%define		rel	8
 
 #
 # main package
@@ -739,8 +739,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_aclocaldir},/dev,/var/log} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_aclocaldir},/dev,/var/{log,run/lirc}} \
+	$RPM_BUILD_ROOT/etc/{lirc,rc.d/init.d,sysconfig}
 
 %if %{with kernel}
 drivers=%{drivers}
@@ -756,13 +756,13 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
 
-cat>$RPM_BUILD_ROOT%{_sysconfdir}/lircd.conf<<END
+cat>$RPM_BUILD_ROOT%{_sysconfdir}/lirc/lircd.conf<<END
 #
 # This is a placeholder for your configuration file.
 # See %{_docdir}/%{pname}-%{version}/remotes for some examples.
 #
 END
-cp -f $RPM_BUILD_ROOT%{_sysconfdir}/lirc{,m}d.conf
+cp -f $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lirc{,m}d.conf
 install contrib/*.m4 $RPM_BUILD_ROOT%{_aclocaldir}
 :> $RPM_BUILD_ROOT/var/log/lircd
 
@@ -808,6 +808,14 @@
 	/sbin/chkconfig --del lircmd
 fi
 
+%triggerpostun -- %{name} < 0.8.6-8
+if [ -f %{_sysconfdir}/lircd.conf.rpmsave ]; then
+	mv -f %{_sysconfdir}/lircd.conf.rpmsave %{_sysconfdir}/lirc/lircd.conf
+fi
+if [ -f %{_sysconfdir}/lircmd.conf.rpmsave ]; then
+	mv -f %{_sysconfdir}/lircmd.conf.rpmsave %{_sysconfdir}/lirc/lircmd.conf
+fi
+
 %post	-n kernel%{_alt_kernel}-char-lirc-atiusb
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
@@ -994,14 +1002,16 @@
 %attr(754,root,root) /etc/rc.d/init.d/lircd
 %attr(754,root,root) /etc/rc.d/init.d/lircmd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lircd
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lircd.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lircmd.conf
+%dir %{_sysconfdir}/lirc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lirc/lircd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lirc/lircmd.conf
 %{_mandir}/man1/ir[!x]*.1*
 %{_mandir}/man1/lircrcd.1*
 %{_mandir}/man1/mode2.1*
 %{_mandir}/man8/lircd.8*
 %{_mandir}/man8/lircmd.8*
 %ghost %attr(600,root,root) /var/log/lircd
+%dir /var/run/lirc
 
 %files remotes
 %defattr(644,root,root,755)
@@ -1127,6 +1137,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220  2009/12/05 15:29:53  charles
+- realy update to 0.8.6 (see NEWS)
+- rel. 8 (for triggerpostun)
+
 Revision 1.219  2009/11/22 20:58:07  arekm
 - release 7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lirc/lirc.spec?r1=1.219&r2=1.220&f=u