[orbited/el6/master: 6/7] Merge branch 'master' into el6

[Luke Macken]

commit 03da618ef784b0eb9f7cae6075fb91edb45a5bee
Merge: c6ebb0c 68a5507
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Dec 14 13:59:19 2010 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	orbited-0.7.10-daemon.patch
    	orbited-cfg.patch
    	orbited.init
    	orbited.spec

 orbited-0.7.10-daemon.patch |   35 +++++++--------
 orbited-cfg.patch           |   30 +++++++++++--
 orbited.init                |   98 ++++++++++++++++++++++++++----------------
 orbited.spec                |   23 +++++++++-
 4 files changed, 124 insertions(+), 62 deletions(-)
---
diff --cc orbited.spec
index d4b1434,5acf375..36a35f8
--- a/orbited.spec
+++ b/orbited.spec
@@@ -3,7 -6,7 +6,7 @@@
  Name:           orbited
  Summary:        A browser(javascript)->tcp bridge
  Version:        0.7.10
- Release:        4%{?dist}
 -Release:        6%{?dist}
++Release:        5%{?dist}
  License:        MIT and BSD
  Group:          System Environment/Daemons
  URL:            http://www.orbited.org/
@@@ -54,6 -58,10 +57,11 @@@ rm -rf %{buildroot
  %{__cp} %{SOURCE2} %{buildroot}/%{_initrddir}/orbited
  
  %{__mkdir} -p %{buildroot}/%{_sysconfdir}
+ %{__mkdir} -p %{buildroot}/%logdir
+ %{__install} -d -m0755 %{buildroot}/var/run/%{name}
+ 
+ 
++>>>>>>> master
  %{__cp} orbited.cfg %{buildroot}/%{_sysconfdir}/orbited.cfg
  
  %clean
@@@ -67,9 -75,13 +75,10 @@@ rm -rf %{buildroot
  
  %post
  /sbin/chkconfig --add orbited
 -if [ $1 -gt 1 ]; then
 -    %{_initrddir}/orbited try-restart >/dev/null || :
 -fi
  
+ 
  %preun
- if [ $1 = 0 ]; then
+ if [ $1 -eq 0 ]; then
          /sbin/service orbited stop >/dev/null 2>&1
          /sbin/chkconfig --del orbited
  fi
@@@ -82,8 -94,21 +91,18 @@@
  %{python_sitelib}/orbited*.egg-info/
  %{_initrddir}/%{name}
  %config(noreplace) %{_sysconfdir}/%{name}.cfg
+ %attr(0730,root,%username) %dir %logdir
+ %ghost %attr(755, %username, %username) /var/run/%{name}
+ 
  
  %changelog
 -* Tue Dec 14 2010 Luke Macken <lmacken at redhat.com> - 0.7.10-6
++* Tue Dec 14 2010 Luke Macken <lmacken at redhat.com> - 0.7.10-5
+ - Setup and configure an appropriate logging directory (#575622)
+ - Init script improvements (#575619)
+ - Have our daemon patch run earlier in the code path to prevent orbited from
+   spinning on closed file descriptors (#575618).
+ - Update our daemon patch to have it write out pid files
+ 
 -* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.7.10-5
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 -
  * Wed Mar 24 2010 Luke Macken <lmacken at redhat.com> - 0.7.10-4
  - Fix the scriptlets