[ladvd/f16] drop SysV init script and sysconfig file

[Tomasz Torcz]

commit 37d90a166f09e35362abcf4e756e2533e6dec317
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date:   Sat Aug 13 11:21:13 2011 +0200

    drop SysV init script and sysconfig file

 ladvd.service |    7 +++++--
 ladvd.spec    |   15 +++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/ladvd.service b/ladvd.service
index 439c334..4a3bf6c 100644
--- a/ladvd.service
+++ b/ladvd.service
@@ -1,10 +1,13 @@
+# To modify this unit, copy it to /etc/systemd/system and edit there
+# This way a list of interfaces which ladvd should utilize can be supplied.
+
 [Unit]
-Description=uses cdp / lldp frames to inform switches about connected hosts
+Description=uses CDP / LLDP frames to inform switches about connected hosts
 Requires=network.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/ladvd
-ExecStart=/usr/sbin/ladvd -f $LADVD_OPTIONS
+ExecStart=/usr/sbin/ladvd -f -a
 PIDFile=/var/run/ladvd.pid
 StandardOutput=syslog
 
diff --git a/ladvd.spec b/ladvd.spec
index c4e94d6..36d8f66 100644
--- a/ladvd.spec
+++ b/ladvd.spec
@@ -16,13 +16,11 @@ Group:          Applications/Internet
 License:        ISC
 URL:            http://www.blinkenlights.nl/software/ladvd/
 Source0:        http://www.blinkenlights.nl/software/ladvd/ladvd-%{version}.tar.gz
-Source1:        ladvd.sysconfig
-Source2:        ladvd.init
+Source1:        ladvd.service
+Source2:        ladvd.tmpfiles
 Source3:        %{modulename}.te
 Source4:        %{modulename}.fc
 Source5:        %{modulename}.if
-Source6:        ladvd.tmpfiles
-Source7:        ladvd.service
 # proposed upstream: http://code.google.com/p/ladvd/issues/detail?id=6
 Patch0:         ladvd-0.9.2-add-attribute-unused-to-tlv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,13 +93,11 @@ cd -
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}%{_docdir}/ladvd
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-install -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
 mkdir -p %{buildroot}%{homedir}
 mkdir -p %{buildroot}%{_libdir}/../lib/tmpfiles.d
-install -m 0644 %{SOURCE6} %{buildroot}%{_libdir}/../lib/tmpfiles.d/%{name}.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{_libdir}/../lib/tmpfiles.d/%{name}.conf
 mkdir -p %{buildroot}%{_unitdir}
-cp -p %SOURCE7 %{buildroot}%{_unitdir}
+cp -p %SOURCE1 %{buildroot}%{_unitdir}
 
 
 cd SELinux
@@ -172,8 +168,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc doc/ChangeLog doc/README doc/LICENSE doc/TODO
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%{_initrddir}/%{name}
 %{_sbindir}/%{name}
 %{_sbindir}/%{name}c
 %{_mandir}/man8/%{name}.8*
@@ -192,6 +186,7 @@ fi
 %changelog
 * Sat Aug 13 2011 Tomasz Torcz <ttorcz at fedoraprojec.org> - 0.9.2-5
 - place tmpfiles.d conf in /usr/lib/tmpfiles.d
+- drop SysV init script and sysconfig file
 
 * Fri May 6 2011 Tomasz Torcz <ttorcz at fedoraproject.org> - 0.9.2-4
 - Fix systemd-related scriptlets (from Bill Nottingham):