Hello community,
here is the log from the commit of package haproxy for openSUSE:Factory checked
in at 2013-10-29 09:25:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haproxy (Old)
and /work/SRC/openSUSE:Factory/.haproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2013-10-15
10:42:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2013-10-29
09:25:22.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Oct 28 14:32:00 UTC 2013 - p.drou...@gmail.com
+
+- Add systemd support
+ Target distributions all support systemd; keep alive sysvinit support
+ is useless
+
+-------------------------------------------------------------------
Old:
----
haproxy.init
New:
----
haproxy.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haproxy.spec ++++++
--- /var/tmp/diff_new_pack.i87zQ9/_old 2013-10-29 09:25:22.000000000 +0100
+++ /var/tmp/diff_new_pack.i87zQ9/_new 2013-10-29 09:25:22.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package haproxy
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,15 +21,16 @@
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Networking/Web/Proxy
#
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libgcrypt-devel
BuildRequires: pcre-devel libgcrypt-devel
BuildRequires: udev
+BuildRequires: pkgconfig(systemd)
%define pkg_name haproxy
%define pkg_home /var/lib/%{pkg_name}
#
Url: http://haproxy.1wt.eu/
Source:
http://haproxy.1wt.eu/download/1.4/src/haproxy-%{version}.tar.gz
-Source1: %{pkg_name}.init
+Source1: %{pkg_name}.service
Source2: http://haproxy.1wt.eu/download/contrib/haproxy.vim
Patch1: haproxy-1.2.16_config_haproxy_user.patch
Patch2: haproxy-makefile_lib.patch
@@ -38,6 +39,7 @@
Summary: The Reliable, High Performance TCP/HTTP Load Balancer
Provides: %{name}-doc = %{version}
Obsoletes: %{name}-doc < %{version}
+%{?systemd_requires}
%description
HAProxy implements an event-driven, mono-process model which enables support
@@ -67,29 +69,25 @@
%install
%{__install} -D -m 0755 %{pkg_name}
%{buildroot}%{_sbindir}/%{pkg_name}
%{__install} -D -m 0644 examples/%{pkg_name}.cfg
%{buildroot}%{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg
-%{__install} -D -m 0755 %{S:1}
%{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
-%{__ln_s} -f %{_sysconfdir}/init.d/%{pkg_name}
%{buildroot}%{_sbindir}/rc%{pkg_name}
+%{__install} -D -m 0755 %{S:1}
%{buildroot}%{_unitdir}/%{pkg_name}.service
+ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{pkg_name}
%{__install} -d -m 0755 %{buildroot}%{pkg_home}
%{__install} -D -m 0644 %{S:2}
%{buildroot}%{_datadir}/%{pkg_name}/%{pkg_name}.vim
%{__install} -D -m 0644 doc/%{pkg_name}.1
%{buildroot}%{_mandir}/man1/%{pkg_name}.1
gzip %{buildroot}%{_mandir}/man1/%{pkg_name}.1
-%clean
-%{?buildroot:%{__rm} -rf %{buildroot}}
-
%pre
/usr/sbin/groupadd -r %{pkg_name} &>/dev/null ||:
/usr/sbin/useradd -g %{pkg_name} -s /bin/false -r -c "user for %{pkg_name}"
-d %{pkg_home} %{pkg_name} &>/dev/null ||:
%post
-%fillup_and_insserv %{pkg_name}
+%service_add_post %{pkg_name}.service
%preun
-%stop_on_removal %{pkg_name}
+%service_del_preun %{pkg_name}.service
%postun
-%restart_on_update %{pkg_name}
-%{insserv_cleanup}
+%service_del_postun %{pkg_name}.service
%files
%defattr(-,root,root,-)
@@ -97,7 +95,7 @@
%doc ROADMAP TODO doc/* examples
%dir %{_sysconfdir}/%{pkg_name}
%config(noreplace) %{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg
-%config(noreplace) %{_sysconfdir}/init.d/%{pkg_name}
+%{_unitdir}/%{pkg_name}.service
%{_sbindir}/haproxy
%{_sbindir}/rchaproxy
%{pkg_home}
++++++ haproxy.service ++++++
[Unit]
Description=HAProxy For TCP And HTTP Based Applications
After=network.target
[Service]
Type=forking
PIDFile=/run/haproxy.pid
ExecStartPre=/usr/sbin/haproxy -c -q -f /etc/haproxy/haproxy.cfg
ExecStart=/usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid
ExecReload=/bin/bash -c "exec /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg
-p /run/haproxy.pid -sf $MAINPID"
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
