[lsyncd/el5: 3/3] Merge branch 'el6' into el5

[Paul Wouters]

commit 35ca81b2c66ad7fcdf37709f2c3b5e8d9c64b095
Merge: b8e78ed b1c460b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Dec 21 16:25:34 2012 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	lsyncd.spec

 .gitignore       |    1 +
 lsyncd.conf      |   11 ++++++
 lsyncd.init      |  103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lsyncd.logrotate |   10 +++++
 lsyncd.spec      |   65 ++++++++++++++++++++++++++-------
 lsyncd.sysconfig |    6 +++
 sources          |    2 +-
 7 files changed, 183 insertions(+), 15 deletions(-)
---
diff --cc lsyncd.spec
index 09fc453,74f24bd..19614ee
--- a/lsyncd.spec
+++ b/lsyncd.spec
@@@ -7,10 -6,22 +6,23 @@@ Group:          Applications/Interne
  License:        GPLv2+
  URL:            http://code.google.com/p/lsyncd/
  Source0:        http://lsyncd.googlecode.com/files/%{name}-%{version}.tar.gz
 +BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  
+ Source1: %{name}.init
+ Source3: %{name}.sysconfig
+ Source4: %{name}.logrotate
+ Source5: %{name}.conf
+ 
+ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  BuildRequires:  lua-devel >= 5.1.3
- BuildRequires:  prelink
+ BuildRequires:  asciidoc
+ Requires: lua
+ Requires: rsync, openssh-clients
+ 
+ Requires(post): chkconfig
+ Requires(preun): chkconfig
+ Requires(preun): initscripts
+ Requires(postun): initscripts
  
  %description
  Lsyncd watches a local directory trees event monitor interface (inotify).