- rel 14

- get rid of /media entries as we did in FHS.spec

Changed files:
    compat-pld-media.tmpfiles -> 1.2
    systemd.spec -> 1.156

diff --git a/compat-pld-media.tmpfiles b/compat-pld-media.tmpfiles
deleted file mode 100644 (file)
index 1f69cb7..0000000
--- a/compat-pld-media.tmpfiles
+++ /dev/null
@@ -1,8 +0,0 @@
-# For some unknown reason we are providing these in FHS.
-#
-# TODO: remove it.
-#
-# See tmpfiles.d(5) for details
-
-d /media/floppy 0755 root root -
-d /media/cdrom 0755 root root -

diff --git a/systemd.spec b/systemd.spec
index 5a69aa4e10008554c840403122afa1fe284c3833..7d96fe8ff90fcf4439a9c4db93a61aed8b7cdce1 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,7 +20,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:       13
+Release:       14
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -28,7 +28,6 @@ Source0:      http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
-Source4:       compat-pld-media.tmpfiles
 Source5:       compat-pld-var-run.tmpfiles
 Source10:      pld-storage-init-late.service
 Source11:      pld-storage-init.service
@@ -389,7 +388,6 @@ ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/random.service
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/network.service
 
 # install compatibility tmpfiles configs
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-media.conf
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
 
 # Install and enable storage subsystems support services (RAID, LVM, etc.)