- rc-scripts uses rc-local.service now (and masks local), no need to rename here

Changed files:
    rc.local.patch -> 1.2
    systemd.spec -> 1.135

diff --git a/rc.local.patch b/rc.local.patch
deleted file mode 100644 (file)
index f2c1b71..0000000
--- a/rc.local.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- systemd-44/units/plymouth-quit-wait.service~       2011-02-24 22:00:59.000000000 +0200
-+++ systemd-44/units/plymouth-quit-wait.service        2012-03-21 10:11:55.023579373 +0200
-@@ -7,7 +7,7 @@
- 
- [Unit]
- Description=Wait for Plymouth Boot Screen to Quit
--After=rc-local.service plymouth-start.service
-+After=local.service plymouth-start.service
- 
- [Service]
- ExecStart=-/bin/plymouth --wait
---- systemd-44/units/plymouth-quit.service~    2011-02-22 19:50:32.000000000 +0200
-+++ systemd-44/units/plymouth-quit.service     2012-03-21 10:12:37.432190271 +0200
-@@ -7,7 +7,7 @@
- 
- [Unit]
- Description=Terminate Plymouth Boot Screen
--After=rc-local.service plymouth-start.service
-+After=local.service plymouth-start.service
- 
- [Service]
- ExecStart=-/bin/plymouth quit
---- systemd-44/units/./serial-getty@.service.m4~       2012-03-21 10:13:37.000000000 +0200
-+++ systemd-44/units/./serial-getty@.service.m4        2012-03-21 10:15:19.299611109 +0200
-@@ -13,7 +13,7 @@
- After=rc-local.service
- )m4_dnl
- m4_ifdef(`TARGET_PLD',
--After=rc-local.service
-+After=local.service
- )m4_dnl
- m4_ifdef(`TARGET_ARCH',
- After=rc-local.service
---- systemd-44/units//console-shell.service.m4~        2012-03-21 10:15:55.000000000 +0200
-+++ systemd-44/units//console-shell.service.m4 2012-03-21 10:16:08.138516803 +0200
-@@ -12,7 +12,7 @@
- After=rc-local.service
- )m4_dnl
- m4_ifdef(`TARGET_PLD',
--After=rc-local.service
-+After=local.service
- )m4_dnl
- m4_ifdef(`TARGET_ARCH',
- After=rc-local.service
---- systemd-44/units/./getty@.service.m4~      2012-03-21 10:15:55.000000000 +0200
-+++ systemd-44/units/./getty@.service.m4       2012-03-21 10:16:19.025682595 +0200
-@@ -13,7 +13,7 @@
- After=rc-local.service
- )m4_dnl
- m4_ifdef(`TARGET_PLD',
--After=rc-local.service
-+After=local.service
- )m4_dnl
- m4_ifdef(`TARGET_ARCH',
- After=rc-local.service

diff --git a/systemd.spec b/systemd.spec
index 1dfd1906d080a6ab77ef6cea878a760856be9b8c..1f34d40bc824cc0bfbc218dfff2e0b660ff843fb 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -17,7 +17,7 @@ Summary:      A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 Version:       44
-Release:       3.4
+Release:       4
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -37,7 +37,6 @@ Patch2:               shut-sysv-up.patch
 Patch3:                pld-sysv-network.patch
 Patch4:                tmpfiles-not-fatal.patch
 Patch5:                CVE-2012-1174.patch
-Patch6:                rc.local.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -77,7 +76,7 @@ Requires:     agetty
 Requires:      dbus >= 1.4.16-6
 Requires:      filesystem >= 4.0-2
 Requires:      libutempter
-Requires:      rc-scripts >= 0.4.5.3-6
+Requires:      rc-scripts >= 0.4.5.3-7
 Requires:      setup >= 2.8.0-2
 Requires:      udev-core >= 1:175-5
 Requires:      udev-libs >= 1:172
@@ -334,7 +333,6 @@ Force update of packages that provide tmpfiles.d configuration
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -673,6 +671,7 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/network-post.service
 %config(noreplace,missingok) %{systemdunitdir}/graphical.target.wants/*
 %config(noreplace,missingok) %{systemdunitdir}/local-fs.target.wants/*
 %config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/getty.target
+%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/rc-local.service
 %config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-ask-password-wall.path
 %config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-logind.service
 %config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service