packages: systemd/systemd.spec - 42 - systemd binary location changed (comp...

[baggins]

Author: baggins                      Date: Sun Feb 12 13:13:19 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 42
- systemd binary location changed (compat symlink preseved)
- we want support for /bin and /sbin NOT being symlinks to /usr
- systemd now uses libkmod to handle kernel modules, module-init-tools is not supported

---- Files affected:
packages/systemd:
   systemd.spec (1.111 -> 1.112) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.111 packages/systemd/systemd.spec:1.112
--- packages/systemd/systemd.spec:1.111	Sun Feb 12 13:25:15 2012
+++ packages/systemd/systemd.spec	Sun Feb 12 14:13:13 2012
@@ -10,18 +10,19 @@
 %bcond_without	cryptsetup	# without cryptsetup support
 %bcond_without	gtk		# build gtk tools
 %bcond_without	pam		# PAM authentication support
+%bcond_with	plymouth	# plymouth support
 %bcond_without	selinux		# without SELinux support
 %bcond_without	tcpd		# libwrap (tcp_wrappers) support
 
 Summary:	A System and Service Manager
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
-Version:	39
-Release:	4
+Version:	42
+Release:	0.1
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5:	7179b34f6f6553d2a36551ac1dec5f0d
+# Source0-md5:	7686b44e368d2523901d3e903ed4dcea
 Source1:	%{name}-sysv-convert
 Source2:	%{name}_booted.c
 Source3:	ifup at .service
@@ -51,6 +52,7 @@
 BuildRequires:	binutils >= 3:2.22.52.0.1-2
 BuildRequires:	gperf
 BuildRequires:	intltool >= 0.40.0
+BuildRequires:	kmod-devel >= 5
 BuildRequires:	libcap-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool >= 2:2.2
@@ -58,6 +60,7 @@
 BuildRequires:	libxslt-progs
 BuildRequires:	m4
 %{?with_pam:BuildRequires:	pam-devel}
+%{?with_plymouth:BuildRequires:	plymouth-devel}
 BuildRequires:	pkgconfig >= 0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.627
 BuildRequires:	udev-devel >= 1:172
@@ -70,6 +73,7 @@
 Requires:	agetty
 Requires:	dbus >= 1.4.16-6
 Requires:	filesystem >= 4.0-2
+Requires:	kmod >= 5
 Requires:	rc-scripts >= 0.4.5.1-7
 Requires:	setup >= 2.8.0-2
 Requires:	udev-core >= 1:175-5
@@ -308,13 +312,15 @@
 	%{__enable_disable cryptsetup libcryptsetup} \
 	%{__enable_disable gtk} \
 	%{__enable_disable pam} \
+	%{__enable_disable plymouth} \
 	%{__enable_disable selinux} \
 	%{__enable_disable tcpd tcpwrap} \
 	--disable-silent-rules \
 	--disable-static \
 	--with-distro=pld \
 	--with-rootprefix= \
-	--with-rootlibdir=/%{_lib}
+	--with-rootlibdir=/%{_lib} \
+	--enable-split-usr
 
 %{__make}
 ./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
@@ -327,10 +333,13 @@
 
 ./libtool --mode=install install -m755 systemd_booted $RPM_BUILD_ROOT/bin/systemd_booted
 
+# Main binary has been moved, but we don't want to break existing installs
+ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/bin/systemd
+
 # Create SysV compatibility symlinks. systemctl/systemd are smart
 # enough to detect the way they were called
 install -d $RPM_BUILD_ROOT/sbin
-ln -s ../bin/systemd $RPM_BUILD_ROOT/sbin/init
+ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/sbin/init
 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/reboot
@@ -505,6 +514,7 @@
 %attr(755,root,root) %{_bindir}/systemd-sysv-convert
 %attr(755,root,root) /lib/systemd/systemd-*
 %dir /lib/systemd/system-generators
+%attr(755,root,root) /lib/systemd/systemd
 %attr(755,root,root) /lib/systemd/system-generators/systemd-*-generator
 %dir /lib/systemd/system-shutdown
 /lib/udev/rules.d/99-systemd.rules
@@ -683,6 +693,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112  2012/02/12 13:13:13  baggins
+- 42
+- systemd binary location changed (compat symlink preseved)
+- we want support for /bin and /sbin NOT being symlinks to /usr
+- systemd now uses libkmod to handle kernel modules, module-init-tools is not supported
+
 Revision 1.111  2012/02/12 12:25:15  baggins
 - rel 4
 - C:pam without pam_systemd.so in system-auth
================================================================

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