packages: systemd/systemd.spec - better file location - add symlinks for Sy...

[shadzik]

Author: shadzik                      Date: Thu Nov 25 13:58:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- better file location
- add symlinks for SysVinit commands

---- Files affected:
packages/systemd:
   systemd.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.12 packages/systemd/systemd.spec:1.13
--- packages/systemd/systemd.spec:1.12	Thu Nov 25 14:48:20 2010
+++ packages/systemd/systemd.spec	Thu Nov 25 14:58:43 2010
@@ -27,10 +27,10 @@
 BuildRequires:	libtool
 BuildRequires:	udev-devel >= 160
 BuildRequires:	vala >= 0.11
-Provides:	virtual(init-daemon)
 Provides:	SysVinit = 2.86-23
-Obsoletes:	virtual(init-daemon)
+Provides:	virtual(init-daemon)
 Obsoletes:	SysVinit
+Obsoletes:	virtual(init-daemon)
 Obsoletes:	vserver-SysVinit
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,7 +67,7 @@
 	--with-syslog-service=syslog-ng \
 	--with-sysvinit-path=/etc/rc.d/init.d \
 	--with-sysvrcd-path=/etc/rc.d \
-	--with-rootdir=/usr
+	--with-rootdir=
 
 %{__make}
 
@@ -77,19 +77,37 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# Create SysV compatibility symlinks. systemctl/systemd are smart
+# enough to detect in which way they are called.
+install -d $RPM_BUILD_ROOT/sbin
+ln -s ../bin/systemd $RPM_BUILD_ROOT/sbin/init
+ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/reboot
+ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/halt
+ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/poweroff
+ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/shutdown
+ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit
+ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc DISTRO_PORTING README TODO
-%attr(755,root,root) %{_bindir}/systemctl
-%attr(755,root,root) %{_bindir}/systemd
-%attr(755,root,root) %{_bindir}/systemd-ask-password
+%attr(755,root,root) /bin/systemctl
+%attr(755,root,root) /bin/systemd
+%attr(755,root,root) /bin/systemd-ask-password
 %attr(755,root,root) %{_bindir}/systemd-cgls
-%attr(755,root,root) %{_bindir}/systemd-notify
-%attr(755,root,root) %{_bindir}/systemd-tty-ask-password-agent
-%{_prefix}/lib/systemd/
+%attr(755,root,root) /bin/systemd-notify
+%attr(755,root,root) /bin/systemd-tty-ask-password-agent
+/sbin/halt
+/sbin/init
+/sbin/poweroff
+/sbin/reboot
+/sbin/runlevel
+/sbin/shutdown
+/sbin/telinit
+/lib/systemd/
 /etc/dbus-1/system.d/org.freedesktop.systemd1.conf
 %{_sysconfdir}/systemd
 %{_sysconfdir}/tmpfiles.d
@@ -167,6 +185,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/11/25 13:58:43  shadzik
+- better file location
+- add symlinks for SysVinit commands
+
 Revision 1.12  2010/11/25 13:48:20  shadzik
 - P: SysVinit = 2.86-23
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.12&r2=1.13&f=u