Merge pull request #35648 (suigintoh/ultramonkey-l7-v3/master into master).

[ultramonkey-l7/ultramonkey-l7-v3.git] / ultramonkeyl7.spec

diff --git a/ultramonkeyl7.spec b/ultramonkeyl7.spec
index 516e2d0..0fd1ad4 100644 (file)
--- a/ultramonkeyl7.spec
+++ b/ultramonkeyl7.spec
@@ -6,11 +6,11 @@
 
 Summary: The Layer-7 Virtual Server
 Name: ultramonkeyl7
-Version: 3.1.0
-Release: devel%{?dist}
+Version: 3.1.3
+Release: rc1%{?dist}
 License: LGPLv2.1
 Group: System Environment/Daemons
-URL: http://sourceforge.jp/projects/ultramonkey-l7/
+URL: http://osdn.jp/projects/ultramonkey-l7/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel
@@ -27,6 +27,14 @@ Requires: perl-Crypt-SSLeay
 Requires: perl-Net-SSLeay
 Requires: perl-IO-Socket-SSL
 Requires: perl-IO-Socket-INET6
+Requires: perl-Time-HiRes
+
+%if 0%{?fedora} >= 15 || 0%{?centos_version} >= 7 || 0%{?rhel} >= 7
+Requires: perl-LWP-Protocol-https
+Requires: perl-Sys-Syslog
+Requires: perl-autodie
+Requires: systemd
+%endif
 
 %define hb2_tempdir    /usr/share/doc/%{name}-%{version}/heartbeat-ra
 %define mibs_tempdir   /usr/share/doc/%{name}-%{version}/mibs
@@ -51,6 +59,9 @@ for UltraMonkeyl7's module.
 ./configure \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
+%if %{defined _unitdir}
+       --with-systemdsystemunitdir=%{_unitdir} \
+%endif
        --localstatedir=%{_localstatedir} \
        --libdir=%{_libdir}
 
@@ -63,7 +74,11 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs/sslproxy
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ha.d/conf
+%if %{defined _unitdir}
+mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
+%else
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
+%endif
 mkdir -p -m 755 ${RPM_BUILD_ROOT}%{l7vs_moddir}
 mkdir -p ${RPM_BUILD_ROOT}%{l7vs_logdir}
 mkdir -p ${RPM_BUILD_ROOT}%{l7vsadm_sockdir}
@@ -81,22 +96,37 @@ mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-chkconfig --add l7vsd
-chkconfig --add l7directord
+%if %{defined _unitdir}
+       systemctl daemon-reload
+%else
+       chkconfig --add l7vsd
+       chkconfig --add l7directord
+%endif
 
 %preun
 if [ $1 = 0 ]; then
+%if %{defined _unitdir}
+       systemctl disable l7directord > /dev/null 2>&1
+       systemctl disable l7vsd > /dev/null 2>&1
+       systemctl stop l7directord > /dev/null 2>&1
+       systemctl stop l7vsd > /dev/null 2>&1
+%else
        /sbin/service l7directord stop > /dev/null 2>&1
        /sbin/service l7vsd stop > /dev/null 2>&1
        chkconfig --del l7vsd
        chkconfig --del l7directord
+%endif
 fi
 
 %files
 %defattr(-, root, root, 0755)
 %{_sbindir}/*
 %{l7vs_moddir}/*
-%{_sysconfdir}/init.d/*
+%if %{defined _unitdir}
+%{_unitdir}/*
+%else
+%{_sysconfdir}/rc.d/init.d/*
+%endif
 %dir %{l7vs_moddir}
 %dir %{l7vs_logdir}
 %dir %{_sysconfdir}/l7vs
@@ -133,6 +163,23 @@ fi
 %{moduledevel_tempdir}/*
 
 %changelog
+* Sun Oct 18 2015 HIBARI Michiro  <l05102@shibaura-it.ac.jp> 3.1.3-rc1
+- Update for 3.1.3-rc1
+- Add systemd Unit file.
+
+* Wed Sep 10 2014 Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp> 3.1.2-1
+- Update for 3.1.2-1
+- Marge from 3.1.2-devel to master. And modefy version.
+- Fixed degraded bug: re-patch for fixed ticket 30300.
+
+* Fri Mar 7 2014 Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp> 3.1.1-1
+- Update for 3.1.1-1
+- Marge from 3.1.1-devel to master. And modefy version.
+
+* Fri Feb 7 2014 Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp> 3.1.1-devel
+- Update for 3.1.1-devel
+- Bugfix
+
 * Sat Sep 8 2012 HIBARI Michiro  <l05102@shibaura-it.ac.jp> 3.1.0-devel
 - Update for 3.1.0-devel
 - Change spec file for generate devel package.
@@ -146,7 +193,7 @@ fi
 * Wed Aug 1 2012 Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp> 3.0.4-rc1
 - Update for 3.0.4-rc1
 
-* Thu Dec 20 2011 HIBARI Michiro <hibari.michirou@nttcom.co.jp> 3.0.3-1
+* Tue Dec 20 2011 HIBARI Michiro <hibari.michirou@nttcom.co.jp> 3.0.3-1
 - Update for 3.0.3-1
 
 * Thu Feb 10 2011 HIBARI Michiro <hibari.michirou@nttcom.co.jp> 3.0.2-1