#3 Sync f30
Merged 2 months ago by rfairley. Opened 2 months ago by rfairley.

@@ -3,7 +3,7 @@ 

  

  Name:           console-login-helper-messages

  Version:        0.16

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        Combines motd, issue, profile features to show system information to the user before/on login

  License:        BSD

  URL:            https://github.com/%{github_owner}/%{github_project}

@@ -26,22 +26,21 @@ 

  # systemd: systemd service and path units, and querying for failed units

  # (the above applies to the issuegen and profile subpackages too)

  Requires:       bash systemd

- # setup: filesystem paths need setting up

+ # setup: filesystem paths need setting up.

  #   * https://pagure.io/setup/pull-request/14

  #   * https://pagure.io/setup/pull-request/15

- # Make exception for fc29 and fc28 - soft requires as we will create /run/motd.d

- # ourselves using tmpfiles if it doesn't already exist.

+ #   * https://pagure.io/setup/pull-request/16

+ # Make exception for fc29 - soft requires as we will create /run/motd.d

+ # ourselves if it doesn't already exist.

  %if 0%{?fc29}

  Requires:       setup

  %else

- %if 0%{?fc28}

- Requires:       setup

- %else

  Requires:       setup >= 2.12.7-1

  %endif

- %endif

- # pam: Needed to display issues symlinked from /etc/motd.d.

+ # pam: to display motds in /run/motd.d.

  #   * https://github.com/linux-pam/linux-pam/issues/47

+ #   * https://github.com/linux-pam/linux-pam/pull/69

+ #   * https://github.com/linux-pam/linux-pam/pull/76

  Requires:       ((pam >= 1.3.1-15) if openssh)

  # selinux-policy: to apply pam_var_run_t contexts:

  #   * https://github.com/fedora-selinux/selinux-policy/pull/244

@@ -65,9 +64,6 @@ 

  # fedora-release: for /etc/issue.d path

  #   * https://src.fedoraproject.org/rpms/fedora-release/pull-request/64#

  Requires:       fedora-release

- # TODO: add a requires for redhat-release-coreos once merged

- #   * https://github.com/openshift/redhat-release-coreos/pull/18

- # Requires:       redhat-release-coreos

  # agetty is included in util-linux, which searches /etc/issue.d.

  # Needed to display issues symlinked from /etc/issue.d.

  #   * https://github.com/karelzak/util-linux/commit/37ae6191f7c5686f1f9a2c3984e2cd9a62764029#diff-15eca7082c3cb16e5ac467f4acceb9d0R54

@@ -120,7 +116,6 @@ 

  install -DpZm 0644 usr/lib/tmpfiles.d/%{name}-motdgen-tmpfiles.conf %{buildroot}%{_tmpfilesdir}/%{name}-motdgen.conf

  install -DpZm 0755 usr/libexec/%{name}/motdgen %{buildroot}%{_libexecdir}/%{name}/motdgen

  

- 

  # profile files

  install -DpZm 0644 usr/lib/tmpfiles.d/%{name}-profile-tmpfiles.conf %{buildroot}%{_tmpfilesdir}/%{name}-profile.conf

  install -DpZm 0755 usr/share/%{name}/profile.sh %{buildroot}%{_prefix}/share/%{name}/profile.sh

@@ -179,6 +174,9 @@ 

  %{_sysconfdir}/profile.d/%{name}-profile.sh

  

  %changelog

+ * Fri Jun 21 2019 Robert Fairley <rfairley@redhat.com> - 0.16-3

+ - Specfile tidyups (comments, formatting), and remove fc28 conditionals

+ 

  * Fri Mar 22 2019 Robert Fairley <rfairley@redhat.com> - 0.16-2

  - Add condition for f28 setup Requires

  

no initial comment

Pull-Request has been merged by rfairley

2 months ago