@@ -8,3 +8,4 @@ systemd-7.tar.bz2
|
|
8
8
|
/systemd-11.tar.bz2
|
9
9
|
/systemd-12.tar.bz2
|
10
10
|
/systemd-13.tar.bz2
|
11
|
+
/systemd-14.tar.bz2
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
936db9cb28903bdd1b1dcb7aea238107 systemd-14.tar.bz2
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Name: systemd
|
2
2
|
Url: http://www.freedesktop.org/wiki/Software/systemd
|
3
3
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
4
|
-
Version:
|
4
|
+
Version: 14
|
5
5
|
Release: 1%{?dist}
|
6
6
|
License: GPLv2+
|
7
7
|
Group: System Environment/Base
|
@@ -31,6 +31,7 @@ Requires: initscripts >= 9.22
|
|
31
31
|
Requires: selinux-policy >= 3.8.7
|
32
32
|
Requires: kernel >= 2.6.35.2-9.fc14
|
33
33
|
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
|
34
|
+
Source1: console.conf
|
34
35
|
# For sysvinit tools
|
35
36
|
Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
|
36
37
|
Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
|
@@ -40,6 +41,8 @@ Obsoletes: systemd-sysvinit
|
|
40
41
|
Obsoletes: upstart < 0.6.5-9
|
41
42
|
Obsoletes: upstart-sysvinit < 0.6.5-9
|
42
43
|
Conflicts: upstart-sysvinit
|
44
|
+
Obsoletes: readahead < 1.5.7-3
|
45
|
+
Provides: readahead = 1.5.7-3
|
43
46
|
|
44
47
|
%description
|
45
48
|
systemd is a system and service manager for Linux, compatible with
|
@@ -99,10 +102,6 @@ ln -s ../bin/systemctl %{buildroot}/sbin/runlevel
|
|
99
102
|
# them.
|
100
103
|
rm -r %{buildroot}/etc/systemd/system/*.target.wants
|
101
104
|
|
102
|
-
# We haven't updated Fedora for tmpfs on /var/run and /var/lock yet
|
103
|
-
rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-run.mount
|
104
|
-
rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-lock.mount
|
105
|
-
|
106
105
|
# Make sure the %ghost-ing below works
|
107
106
|
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel2.target
|
108
107
|
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel3.target
|
@@ -115,6 +114,8 @@ mkdir -p %{buildroot}/lib/systemd/system/default.target.wants
|
|
115
114
|
mkdir -p %{buildroot}/lib/systemd/system/dbus.target.wants
|
116
115
|
mkdir -p %{buildroot}/lib/systemd/system/syslog.target.wants
|
117
116
|
|
117
|
+
install -m 644 -p $RPM_SOURCE_DIR/console.conf $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/console.conf
|
118
|
+
|
118
119
|
%clean
|
119
120
|
rm -rf $RPM_BUILD_ROOT
|
120
121
|
|
@@ -142,7 +143,8 @@ if [ $1 -eq 1 ] ; then
|
|
142
143
|
quotaon.service \
|
143
144
|
quotacheck.service \
|
144
145
|
systemd-readahead-replay.service \
|
145
|
-
systemd-readahead-collect.service
|
146
|
+
systemd-readahead-collect.service \
|
147
|
+
hwclock-load.service > /dev/null 2>&1 || :
|
146
148
|
fi
|
147
149
|
|
148
150
|
%preun units
|
@@ -154,7 +156,8 @@ if [ $1 -eq 0 ] ; then
|
|
154
156
|
quotaon.service \
|
155
157
|
quotacheck.service \
|
156
158
|
systemd-readahead-replay.service \
|
157
|
-
systemd-readahead-collect.service
|
159
|
+
systemd-readahead-collect.service \
|
160
|
+
hwclock-load.service > /dev/null 2>&1 || :
|
158
161
|
|
159
162
|
/bin/rm -f /etc/systemd/system/default.target > /dev/null 2>&1 || :
|
160
163
|
fi
|
@@ -172,6 +175,7 @@ fi
|
|
172
175
|
%{_sysconfdir}/xdg/systemd
|
173
176
|
%{_sysconfdir}/tmpfiles.d/systemd.conf
|
174
177
|
%{_sysconfdir}/tmpfiles.d/x11.conf
|
178
|
+
%{_sysconfdir}/tmpfiles.d/console.conf
|
175
179
|
/bin/systemd
|
176
180
|
/bin/systemd-notify
|
177
181
|
/bin/systemd-ask-password
|
@@ -229,6 +233,12 @@ fi
|
|
229
233
|
%{_mandir}/man1/systemadm.*
|
230
234
|
|
231
235
|
%changelog
|
236
|
+
* Thu Nov 25 2010 Lennart Poettering <lpoetter@redhat.com> - 14-1
|
237
|
+
- Upstream update
|
238
|
+
- Enable hwclock-load by default
|
239
|
+
- Obsolete readahead
|
240
|
+
- Enable /var/run and /var/lock on tmpfs
|
241
|
+
|
232
242
|
* Fri Nov 19 2010 Lennart Poettering <lpoetter@redhat.com> - 13-1
|
233
243
|
- new upstream release
|
234
244
|
|