Merge branch 'master' into el5

znc.spec

@@ -9,7 +9,7 @@ Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.200
 #Release:        0.1.20110801git%{?dist}
-Release:        0.4.rc1%{?dist}
+Release:        0.5.rc1%{?dist}
 #Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
@@ -21,8 +21,6 @@ Source1:        znc.service
 %endif
 #Source0:        http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz
 Patch0:         znc-release.patch
-#Patch1:         znc-modperl.patch
-#Patch2:         znc-modpython.patch
 # git clone https://github.com/znc/znc.git
 # cd znc
 # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
@@ -89,6 +87,7 @@ chmod -x modules/q.cpp
 %__make %{?_smp_mflags}
 
 %pre
+%if %{use_systemd}
 getent group znc >/dev/null || groupadd -r znc
 getent passwd znc >/dev/null || \
     useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \
@@ -96,6 +95,7 @@ getent passwd znc >/dev/null || \
 mkdir -p /var/lib/znc
 chown znc:znc /var/lib/znc
 exit 0
+%endif
 
 %install
 %__rm -Rf "%{buildroot}"
@@ -216,6 +216,9 @@ fi
 %{_libdir}/znc/modtcl.so
 
 %changelog
+* Mon Aug 15 2011 Nick Bebout <nb@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@fedoraproject.org> - 0.200-0.4.rc1
 - Change znc's homedir to /var/lib/znc