[rp-pppoe/f16] fix bz#804396, add missing [Unit] section

[Than Ngo]

commit 302c3dd6934bbb0200e98f3447405e589a34d59a
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 19 16:48:16 2012 +0100

    fix bz#804396, add missing [Unit] section

 rp-pppoe.spec |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/rp-pppoe.spec b/rp-pppoe.spec
index 1f81f62..4374b95 100644
--- a/rp-pppoe.spec
+++ b/rp-pppoe.spec
@@ -23,8 +23,7 @@ Requires: ppp >= 2.4.2
 Requires: initscripts >= 5.92
 Requires: iproute >= 2.6
 Requires: coreutils
-Requires: systemd-units >= 39-2
-Conflicts: filesystem < 3					      
+Requires: systemd-units >= 13
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -35,7 +34,6 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: coreutils
 BuildRequires: ppp
-BuildRequires: systemd-units >= 39-2
 
 ExcludeArch: s390 s390x
 
@@ -59,19 +57,24 @@ make
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_unitdir}
+mkdir -p %{buildroot}/sbin %{buildroot}%{_unitdir}
 
 make -C src install DESTDIR=%{buildroot}
 
-install -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}
-install -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}
-install -m 0755 %{SOURCE3} %{buildroot}%{_sbindir}
-install -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}
-install -m 0755 %{SOURCE5} %{buildroot}%{_sbindir}
+mv %{buildroot}%{_sbindir}/* %{buildroot}/sbin
+
+install -m 0755 %{SOURCE1} %{buildroot}/sbin
+install -m 0755 %{SOURCE2} %{buildroot}/sbin
+install -m 0755 %{SOURCE3} %{buildroot}/sbin
+install -m 0755 %{SOURCE4} %{buildroot}/sbin
+install -m 0755 %{SOURCE5} %{buildroot}/sbin
 install -m 0755 %{SOURCE6} %{buildroot}%{_unitdir}/pppoe-server.service
 
-ln -sf pppoe-stop %{buildroot}%{_sbindir}/adsl-stop
-ln -sf pppoe-start %{buildroot}%{_sbindir}/adsl-start
+pushd %{buildroot}%{_sbindir}
+ln -s ../../sbin/* .
+ln -s ../../sbin/pppoe-stop adsl-stop
+ln -s ../../sbin/pppoe-start adsl-start
+popd
 
 rm -rf %{buildroot}/etc/ppp/pppoe.conf \
        %{buildroot}/etc/rc.d/init.d/pppoe \
@@ -81,6 +84,11 @@ rm -rf %{buildroot}/etc/ppp/pppoe.conf \
 %clean
 rm -rf %{buildroot}
 
+if [ $1 -eq 1 ] ; then
+   # Initial installation
+   /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
 %preun
 if [ "$1" = "0" ]; then
    # Package removal, not upgrade
@@ -109,6 +117,7 @@ triggerun -- %{name} < 3.10-9
 %config(noreplace) %{_sysconfdir}/ppp/pppoe-server-options
 %config(noreplace) %{_sysconfdir}/ppp/firewall*
 %{_unitdir}/pppoe-server.service
+/sbin/*
 %{_sbindir}/*
 %{_mandir}/man?/*
 
@@ -116,13 +125,6 @@ triggerun -- %{name} < 3.10-9
 * Mon Mar 19 2012 Than Ngo <than at redhat.com> - 3.10-12
 - fix bz#804396, add missing [Unit] section
 
-* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 3.10-11
-- install everything in /usr
-  https://fedoraproject.org/wiki/Features/UsrMove
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Tue Jul 05 2011 Than Ngo <than at redhat.com> - 3.10-9
 - bz#697664, native systemd file