Hello community, here is the log from the commit of package ipvsadm for openSUSE:Factory checked in at 2013-12-17 10:01:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old) and /work/SRC/openSUSE:Factory/.ipvsadm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipvsadm" Changes: -------- --- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2011-09-23 02:03:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ipvsadm.new/ipvsadm.changes 2013-12-17 10:01:43.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Oct 28 16:02:10 UTC 2013 - [email protected] + +- Add systemd support and drop sysvinit support +- Remove AUTHORS section +- Remove redundant %clean section + +------------------------------------------------------------------- Old: ---- ipvsadm.init New: ---- ipvsadm.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipvsadm.spec ++++++ --- /var/tmp/diff_new_pack.Uyh11z/_old 2013-12-17 10:01:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Uyh11z/_new 2013-12-17 10:01:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ipvsadm # -# Copyright (c) 2011 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 @@ -15,27 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: ipvsadm BuildRequires: kernel-source popt-devel BuildRequires: libnl-1_1-devel +BuildRequires: systemd Summary: A Utility for Administering the Linux Virtual Server Version: 1.26 Release: 1 License: GPL-2.0+ -Url: http://www.LinuxVirtualServer.org/ +Url: http://www.linuxvirtualserver.org/ Group: Productivity/Networking/System Source0: http://www.LinuxVirtualServer.org/software/ipvsadm-%{version}.tar.bz2 -Source1: ipvsadm.init +Source1: ipvsadm.service Patch1: ipvsadm-%{version}.diff Patch2: ipvsadm-%{version}-print_largenum.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: %{name}-%{version} Requires: grep -PreReq: %insserv_prereq %fillup_prereq -%define prefix /usr +Requires(pre): %fillup_prereq +%{?systemd_requires} %description ipvsadm is a utility for administering the IP virtual server services @@ -43,10 +40,6 @@ -Authors: --------- - Wensong Zhang <[email protected]> - %prep %setup # This files are embedded here instead of being another source in order @@ -71,36 +64,34 @@ %patch2 %build -make POPT_LIB="-lpopt" CFLAGS="${RPM_OPT_FLAGS} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL" +make POPT_LIB="-lpopt" CFLAGS="%{optflags} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL" %install -mkdir -p ${RPM_BUILD_ROOT}/{sbin,usr/sbin,%{_mandir}/man8,etc/init.d,var/adm/fillup-templates} -BUILD_ROOT=${RPM_BUILD_ROOT} MANDIR=%{_mandir} make install +mkdir -p %{buildroot}/{sbin,%{_sbindir},%{_mandir}/man8,%{_unitdir},var/adm/fillup-templates} +make BUILD_ROOT=%{buildroot} MANDIR=%{_mandir} install +# Sysvinit support dropping +rm -rf %{buildroot}/etc/init.d # install SuSE init script -install -m 755 %{S:1} ${RPM_BUILD_ROOT}/etc/init.d/ipvsadm -ln -sf ../../etc/init.d/ipvsadm ${RPM_BUILD_ROOT}/usr/sbin/rcipvsadm -install -m 644 sysconfig.ipvsadm ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.ipvsadm -install -m 644 ipvsadm.rules ${RPM_BUILD_ROOT}/etc/ipvsadm.rules +install -m 755 %{S:1} %{buildroot}%{_unitdir}/%{name}.service +ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{name} +install -m 644 sysconfig.ipvsadm %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} +install -m 644 ipvsadm.rules %{buildroot}%{_sysconfdir}/%{name}.rules %post -%{fillup_and_insserv ipvsadm} +%{fillup_only} +%service_add_post ipvsadm.service %postun -%{insserv_cleanup} - -%clean -if [ -n "$RPM_BUILD_ROOT" ] ; then - [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -fi +%service_del_postun ipvsadm.service %files %defattr(-,root,root) %doc README -%config /etc/ipvsadm.rules -/etc/init.d/ipvsadm +%config %{_sysconfdir}/%{name}.rules +%{_unitdir}/%{name}.service /sbin/* -/usr/sbin/* +%{_sbindir}/* /%{_mandir}/man*/* -/var/adm/fillup-templates/sysconfig.ipvsadm +/var/adm/fillup-templates/sysconfig.%{name} %changelog ++++++ ipvsadm.service ++++++ [Unit] Description=Initialise the Linux Virtual Server After=syslog.target network.target [Service] Type=oneshot ExecStart=/bin/bash -c "exec /sbin/ipvsadm-restore < /etc/sysconfig/ipvsadm" ExecStop=/bin/bash -c "exec /sbin/ipvsadm-save -n > /etc/sysconfig/ipvsadm" ExecStop=/sbin/ipvsadm -C RemainAfterExit=yes [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
