Accepting request 162549 from home:elvigia:branches:network

- remove all sysvinit support

OBS-URL: https://build.opensuse.org/request/show/162549
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=51

dnsmasq.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  3 23:09:10 UTC 2013 - crrodriguez@opensuse.org
+
+- remove all sysvinit support 
+
 -------------------------------------------------------------------
 Tue Mar 12 18:09:40 UTC 2013 - vuntz@suse.com
 

dnsmasq.spec

@@ -23,7 +23,7 @@ Group:          Productivity/Networking/DNS/Servers
 Version:        2.65
 Release:        0
 Provides:       dns_daemon
-PreReq:         /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
+PreReq:         /usr/sbin/useradd /bin/mkdir
 Url:            http://www.thekelleys.org.uk/dnsmasq/
 Source:         http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz
 Source1:        vendor-files.tar.bz2
@@ -31,20 +31,12 @@ Source2:        dnsmasq.service
 Patch1:         group_and_isc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
-BuildRequires:  libidn
 BuildRequires:  libidn-devel
 BuildRequires:  pkg-config
-BuildRequires:  systemd
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
-
+BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
 
-%if %suse_version > 1220
-%define         _unitdir /usr/lib/systemd
-%else
-%define         _unitdir /lib/systemd
-%endif
-
 %description
 Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP
 server. It is designed to provide DNS and, optionally, DHCP, to a small
@@ -93,32 +85,25 @@ fi
 %service_add_pre %{name}.service
 
 %post
-%{fillup_and_insserv dnsmasq}
 %service_add_post %{name}.service
 
 %preun
-%stop_on_removal dnsmasq
 %service_del_preun %{name}.service
 
 %postun
-%restart_on_update dnsmasq
-%{insserv_cleanup}
 %service_del_postun %{name}.service
 
 %install
 make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk
-install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
-install -m 755 rc.dnsmasq-suse $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/dnsmasq
-ln -sf ../../etc/init.d/dnsmasq $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
 install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf
 install -m 644 dnsmasq.reg  $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
 install -m 644 SuSEFirewall.dnsmasq-dns ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
 install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
-install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/system/dnsmasq.service
+install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
 
 # utils subpackage
@@ -135,8 +120,6 @@ rm contrib/wrt/{dhcp_release,dhcp_lease_time}
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib README.SUSE dbus
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
-%{_sysconfdir}/init.d/dnsmasq
-%{_sbindir}/rcdnsmasq
 %{_sbindir}/dnsmasq
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
@@ -144,7 +127,7 @@ rm contrib/wrt/{dhcp_release,dhcp_lease_time}
 %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
 %{_mandir}/man8/dnsmasq.8.gz
 /etc/dbus-1/system.d/dnsmasq.conf
-%{_unitdir}/system/dnsmasq.service
+%{_unitdir}/dnsmasq.service
 %dir %attr(0750,root,tftp) /srv/tftpboot
 
 %files utils