[upstart] remove /lib/upstart/init experiment

[Petr Lautrbach]

commit 6daa74388e5c9ec0b52bb04120b834783851f00f
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Thu Mar 17 18:35:53 2011 +0100

    remove /lib/upstart/init experiment

 upstart.spec |   42 +++++-------------------------------------
 1 files changed, 5 insertions(+), 37 deletions(-)
---
diff --git a/upstart.spec b/upstart.spec
index c0db8ef..4740b16 100644
--- a/upstart.spec
+++ b/upstart.spec
@@ -69,7 +69,7 @@ make install DESTDIR=%{buildroot}
 mv %{buildroot}/sbin/init %{buildroot}/sbin/upstart
 rm %{buildroot}/sbin/halt
 rm %{buildroot}/sbin/poweroff
-mkdir -p -m 755 %{buildroot}/lib/upstart/init
+mkdir -p -m 755 %{buildroot}/lib/upstart
 mv %{buildroot}/sbin/reboot %{buildroot}/lib/upstart/reboot
 mv %{buildroot}/sbin/runlevel %{buildroot}/lib/upstart/runlevel
 mv %{buildroot}/sbin/shutdown %{buildroot}/lib/upstart/shutdown
@@ -93,10 +93,10 @@ rm -f %{buildroot}/%{_mandir}/man8/{halt,init,poweroff,reboot,runlevel,shutdown,
 
 # don't ship default jobs
 rm -f %{buildroot}/%{_sysconfdir}/init/*
-install -m 644 %{SOURCE1} %{buildroot}/lib/upstart/init/
-install -m 644 %{SOURCE3} %{buildroot}/lib/upstart/init/
+install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init/
+install -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/init/
 for file in initjobs-%{initscripts}/*.conf ; do
-  install -m 644 $file %{buildroot}/lib/upstart/init/
+  install -m 644 $file %{buildroot}/%{_sysconfdir}/init/
 done
 
 
@@ -112,37 +112,6 @@ done
 %clean
 rm -rf %{buildroot}
 
-%post
-#create symlinks to /lib/upstart/init after instalation
-if [ $1 -eq 1 ]; then
-  cd /lib/upstart/init
-  for j in *.conf; do
-    if [ ! -e /etc/init/$j ]; then
-      ln -sf /lib/upstart/init/$j /etc/init
-    fi
-  done
-fi
-
-%postun
-#remove broken symlinks from /etc/init
-if [ $1 -eq 0 ]; then
-  for j in $(find -L /etc/init/ -type l); do
-    if ls -l $j | grep -q '/lib/upstart/init/'; then
-      rm -f $j
-    fi
-  done
-fi
-
-%triggerpostun -- upstart < 1.0-2
-#version before 1.0-2 didn't use symlinks to /lib/upstart/init
-cd /lib/upstart/init
-for j in *.conf; do
-  if [ ! -e /etc/init/$j ]; then
-    ln -sf /lib/upstart/init/$j /etc/init
-  fi
-done
-initctl reload-configuration || :
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS
@@ -151,8 +120,7 @@ initctl reload-configuration || :
 %doc README
 %doc TODO
 %doc HACKING
-%dir %{_sysconfdir}/init/
-/lib/upstart/init/
+%{_sysconfdir}/init/
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/Upstart.conf
 %dir /lib/upstart
 /lib/upstart/halt