From f89419ce7ae939b8c635bdc40cddf3844e409b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
Date: Wed, 20 Feb 2019 13:56:14 +0100
Subject: [PATCH] add setup.conf tmpfile to create /run/{motd,motd.d} on boot,
 do not ship /etc/hosts.allow and /etc/hosts.deny, require systemd-rpm-macros
 instead of systemd

---
 .gitignore |  1 +
 setup.spec | 24 +++++++++++++++++++-----
 sources    |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c7d7864..c29bb2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,4 @@ setup-2.8.25.tar.bz2
 /setup-2.12.3.tar.bz2
 /setup-2.12.5.tar.bz2
 /setup-2.12.6.tar.bz2
+/setup-2.13.1.tar.bz2
diff --git a/setup.spec b/setup.spec
index 8fc0857..a430ed3 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,12 +1,14 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.12.6
-Release: 2%{?dist}
+Version: 2.13.1
+Release: 1%{?dist}
 License: Public Domain
+Group: System Environment/Base
 URL: https://pagure.io/setup/
 Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 BuildArch: noarch
-BuildRequires: bash tcsh perl-interpreter
+#systemd-rpm-macros: required to use _tmpfilesdir macro
+BuildRequires: bash tcsh perl-interpreter systemd-rpm-macros
 #require system release for saner dependency order
 Requires: system-release
 Conflicts: filesystem < 3
@@ -48,6 +50,11 @@ mkdir -p %{buildroot}/run/motd.d
 touch %{buildroot}/run/motd
 mkdir -p %{buildroot}/usr/lib/motd.d
 touch %{buildroot}/usr/lib/motd
+#tmpfiles needed for files in /run
+mkdir -p %{buildroot}%{_tmpfilesdir}
+echo "f /run/motd 0644 root root -" >%{buildroot}%{_tmpfilesdir}/%{name}.conf
+echo "d /run/motd.d 0755 root root -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
+chmod 0644 %{buildroot}%{_tmpfilesdir}/%{name}.conf
 
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}/etc/Makefile
@@ -83,8 +90,6 @@ end
 %config(noreplace) /etc/filesystems
 %config(noreplace) /etc/host.conf
 %verify(not md5 size mtime) %config(noreplace) /etc/hosts
-%config(noreplace) /etc/hosts.allow
-%config(noreplace) /etc/hosts.deny
 %verify(not md5 size mtime) %config(noreplace) /etc/motd
 %dir /etc/motd.d
 %verify(not md5 size mtime) %config(noreplace) /run/motd
@@ -107,8 +112,17 @@ end
 %config(noreplace) %verify(not md5 size mtime) /etc/shells
 %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
+%{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Wed Feb 20 2019 Ondrej Vasik <ovasik@redhat.com> - 2.13.1-1
+- do not ship /etc/hosts.allow and /etc/hosts.deny (no need for them
+  in default Fedora)
+- require systemd-rpm-macros instead of systemd
+
+* Wed Jan 23 2019 Robert Fairley <rfairley@redhat.com> - 2.12.7-1
+- add setup.conf tmpfile to create /run/{motd,motd.d} on boot
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index ce3d561..efda701 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setup-2.12.6.tar.bz2) = 926e65f7c790353ab6276b15e2878efb6375c63ff8f4c066b8ce9fb852d9afb152b83231ca655f56ae9cb63ef8f0555fa5e00764204b36e5f53426c0ea7dad2a
+SHA512 (setup-2.13.1.tar.bz2) = 5822ca9e5afbb55347d0b5431e99ff0db801919c2e9932786f7f55a4abafbfc7d165e9931b3be87ddad6ebf2d2a3855a465f95fb69257c6b2f602939098edfb5