From f55ccc9bdab0eac5cb210e57f0ce8c770a877d5a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: May 24 2012 21:37:11 +0000
Subject: rename configuration files to their new names


---

diff --git a/.gitignore b/.gitignore
index f13e3db..bccb100 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/systemd-*/
 /systemd-4.tar.bz2
 /systemd-5.tar.bz2
 /systemd-6.tar.bz2
@@ -12,9 +13,9 @@
 /systemd-15.tar.bz2
 /systemd-16.tar.bz2
 /systemd-17.tar.bz2
-.build-*.log
-x86_64/
-systemd-*src.rpm
+/.build-*.log
+/x86_64/
+/systemd-*src.rpm
 /systemd-18.tar.bz2
 /systemd-19.tar.bz2
 /systemd-20.tar.bz2
diff --git a/systemd.spec b/systemd.spec
index 17ff960..78bebc4 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -37,7 +37,7 @@ BuildRequires:  libtool
 Requires(post): authconfig
 Requires(post): coreutils
 Requires(post): gawk
-Requires(pre):  fileutils
+Requires(pre):  coreutils
 Requires(pre):  /usr/bin/getent /usr/sbin/groupadd
 Requires:       dbus
 Requires:       hwdata
@@ -228,6 +228,10 @@ getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
 getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || :
 systemctl stop systemd-udev.service systemd-udev-control.socket systemd-udev-kernel.socket >/dev/null 2>&1 || :
 
+# Rename configuration files that changed their names
+/usr/bin/mv -n %{_sysconfdir}/systemd/systemd-logind.conf %{_sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
+/usr/bin/mv -n %{_sysconfdir}/systemd/systemd-journald.conf %{_sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
+
 %post
 /sbin/ldconfig
 /usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || :