[znc/el5: 28/29] merge to get common history in all branches

[Björn Esser]

commit 5d6645262f0f540acc0258654eea2a755506d807
Merge: 777fdc9 9f106b2
Author: Björn Esser <bjoern.esser at gmail.com>
Date:   Sun Aug 3 20:58:23 2014 +0200

    merge to get common history in all branches

 znc-crashbug.patch  |   37 --------
 znc-modperl.patch   |   11 ---
 znc-modpython.patch |   11 ---
 znc-release.patch   |   11 ---
 znc.spec            |  227 ++++++++++++++++++++++++++++++++++-----------------
 5 files changed, 151 insertions(+), 146 deletions(-)
---
diff --cc znc.spec
index 0b2325e,c530084..35a852a
--- a/znc.spec
+++ b/znc.spec
@@@ -84,63 -91,107 +91,105 @@@ Requires:      tc
  %description modtcl
  TCL module for ZNC
  
 -
+ %if 0%{?with_modperl}
+ %package modperl
+ Summary:       perl module for ZNC
+ Group:         Development/Libraries
+ 
+ BuildRequires: perl-devel
+ BuildRequires: swig
+ 
+ Requires:      %{name} = %{version}-%{release}
+ Requires:      perl
+ 
+ Provides:      perl(ZNC::Module) = %{version}-%{release}
+ 
+ %description modperl
+ perl module for ZNC
+ %endif # 0%{?with_modperl}
+ 
+ 
+ %if 0%{?with_modpython}
+ %package modpython
+ Summary:       python3 module for ZNC
+ Group:         Development/Libraries
+ 
+ BuildRequires: python3-devel
+ BuildRequires: swig
+ 
+ Requires:      %{name} = %{version}-%{release}
+ Requires:      python3
+ 
+ %description modpython
+ python3 module for ZNC
+ %endif # 0%{?with_modpython}
+ 
+ 
  %prep
- %setup -q -n %{name}-%{version}
- #%setup -q -n znc-1.2-rc2
- #%patch0 -p1
+ %setup -q
  %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
  chmod -x modules/q.cpp
  
+ 
  %build
 -./autogen.sh
  %configure \
       --with-module-prefix=%{_libdir}/znc \
-      --enable-ipv6 --enable-sasl --disable-perl --enable-tcl
+ %if 0%{?with_modperl}
+      --enable-perl
+ %else
+      --disable-perl
+ %endif # 0%{?with_modperl}
+ %if 0%{?with_modpython}
+      --enable-python \
+ %else # 0%{?with_modpython}
+      --disable-python \
+ %endif # 0%{?with_modpython}
+      --enable-ipv6 --enable-sasl --enable-tcl
  %__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 \
-     -c "Account for ZNC to run as" znc
- mkdir -p /var/lib/znc
- chown znc:znc /var/lib/znc
- #exit 0
- #%endif
  
  %install
+ %if 0%{?rhel} && 0%{?rhel} <= 5
  %__rm -Rf "%{buildroot}"
+ %endif # 0%{?rhel} && 0%{?rhel} <= 5
  %__make install DESTDIR="%{buildroot}"
- %if %{use_systemd}
+ %if 0%{?use_systemd}
  mkdir -p %buildroot%{_unitdir}
  install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service
- %endif
- %if !%{use_systemd}
+ %else # 0%{?use_systemd}
  mkdir -p %buildroot%{_initrddir}
  install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/znc
- %endif
+ %endif # 0%{?use_systemd}
  
+ 
+ %if 0%{?rhel} && 0%{?rhel} <= 5
  %clean
  %__rm -Rf "%{buildroot}"
+ %endif # 0%{?rhel} && 0%{?rhel} <= 5
  
- %post
  
- %if %{use_systemd}
- %systemd_post znc.service
- %endif
+ %pre
+ getent group znc >/dev/null || groupadd -r znc
+ getent passwd znc >/dev/null || \
+     useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \
+     -c "Account for ZNC to run as" znc
+ mkdir -p /var/lib/znc
+ chown znc:znc /var/lib/znc
+ 
  
- %if !%{use_systemd}
+ %post
+ %if 0%{?use_systemd}
+ %systemd_post znc.service
+ %else # 0%{?use_systemd}
  # This adds the proper /etc/rc*.d links for the script
  /sbin/chkconfig --add znc
- %endif
+ %endif # 0%{?use_systemd}
  
- %postun
  
- %if %{use_systemd}
+ %postun
+ %if 0%{?use_systemd}
  %systemd_postun_with_restart znc.service
- %endif
- 
- %if !%{use_systemd}
+ %else # 0%{?use_systemd}
  if [ "$1" -ge "1" ] ; then
      /sbin/service znc condrestart >/dev/null 2>&1 || :
  fi