- up to 246.10; make rpm.org happy; readahead was dropped in 217

diff --git a/systemd-configfs.patch b/systemd-configfs.patch
index 345f35ee24bf29cd2f01a99be7bbf3234ad853fb..5064c95c2844cd6fe04d614d45d04fb1aaaa2b78 100644 (file)
--- a/systemd-configfs.patch
+++ b/systemd-configfs.patch
@@ -11,13 +11,12 @@
 diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.mount systemd-208/units/sys-kernel-config.mount
 --- systemd-208.orig/units/sys-kernel-config.mount     2013-08-13 22:02:52.000000000 +0200
 +++ systemd-208/units/sys-kernel-config.mount  2014-01-10 10:22:04.000000000 +0100
-@@ -10,9 +10,9 @@ Description=Configuration File System
+@@ -10,8 +10,9 @@ Description=Configuration File System
  Documentation=https://www.kernel.org/doc/Documentation/filesystems/configfs/configfs.txt
  Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
  DefaultDependencies=no
 -ConditionPathExists=/sys/kernel/config
  ConditionCapability=CAP_SYS_RAWIO
--After=systemd-modules-load.service
 +Wants=sys-kernel-config.service
 +After=systemd-modules-load.service sys-kernel-config.service
  Before=sysinit.target

diff --git a/systemd.spec b/systemd.spec
index 39325a62491ea97ed906c697dfa608b9f64150ac..56472618b7cebfad15b9de0d055f1c28b5bc70a8 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -28,14 +28,14 @@ Summary:    A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:       246.6
+Version:       246.10
 Release:       1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 #Source0Download: https://github.com/systemd/systemd/releases
 Source0:       https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a17b5e6b9e0aa1ac71587c05124e46e7
+# Source0-md5: 64aa63ce1ee531363ea99958a85ee825
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -317,11 +317,9 @@ Summary:   systemd /sbin/init and LSB/SysV compatibility symlinks
 Summary(pl.UTF-8):     /sbin/init z systemd i dowiązania dla kompatybilności z LSB/SysV
 Group:         Base
 Requires:      systemd
-Provides:      readahead = 1:1.5.7-3
-Provides:      virtual(init-daemon)
+Provides:      virtual-init-daemon
 Obsoletes:     SysVinit
-Obsoletes:     readahead < 1:1.5.7-3
-Obsoletes:     virtual(init-daemon)
+Obsoletes:     virtual-init-daemon
 Conflicts:     rc-scripts < 0.4.5.5-2
 Conflicts:     upstart
 # systemd takes care of that and causes problems
@@ -625,7 +623,7 @@ Requires:   systemd-libs = %{epoch}:%{version}-%{release}
 Requires:      udev-libs = %{epoch}:%{version}-%{release}
 Requires:      uname(release) >= 3.13
 Obsoletes:     udev-compat
-Obsoletes:     udev-initrd < %{epoch}:%{version}-%{release}}
+Obsoletes:     udev-initrd < %{epoch}:%{version}-%{release}
 Conflicts:     geninitrd < 12639
 Conflicts:     rc-scripts < 0.4.5.3-1
 Conflicts:     systemd-units < 1:183
@@ -989,8 +987,6 @@ if [ $1 -eq 1 ]; then
        /bin/systemctl enable \
                network.service \
                remote-fs.target \
-               systemd-readahead-replay.service \
-               systemd-readahead-collect.service \
                systemd-udev-settle.service || :
 fi
 
@@ -999,8 +995,6 @@ if [ $1 -eq 0 ] ; then
        /bin/systemctl disable \
                network.service \
                remote-fs.target \
-               systemd-readahead-replay.service \
-               systemd-readahead-collect.service \
                systemd-udev-settle.service || :
 
        %{__rm} -f %{_sysconfdir}/systemd/system/default.target || :