[znc/el5: 3/3] Merge branch 'master' into el5

[Nick Bebout]

commit 20ca2588c9ae93d837854f885bb3b48701678c72
Merge: 98bb697 fa6140c
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Aug 15 21:25:29 2011 -0500

    Merge branch 'master' into el5

 znc.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc znc.spec
index 4441aa7,d1fb780..b9b548b
--- a/znc.spec
+++ b/znc.spec
@@@ -215,7 -235,21 +215,10 @@@ f
  %defattr(-,root,root)
  %{_libdir}/znc/modtcl.so
  
 -%files modperl
 -%defattr(-,root,root)
 -%{_libdir}/znc/modperl/
 -%{_libdir}/znc/modperl.so
 -%{_libdir}/znc/perleval.pm
 -
 -%files modpython
 -%defattr(-,root,root)
 -%{_libdir}/znc/modpython/
 -%{_libdir}/znc/modpython.so
 -
  %changelog
+ * Mon Aug 15 2011 Nick Bebout <nb at fedoraproject.org> - 0.200-0.5.rc1
+ - Don't create the znc user on Fedora 14 and lower and on EPEL
+ 
  * Mon Aug 15 2011 Nick Bebout <nb at fedoraproject.org> - 0.200-0.4.rc1
  - Change znc's homedir to /var/lib/znc