Skip to content

Commit 6cc3b78

Browse files
committed
Spec Review
1 parent d0d186c commit 6cc3b78

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

greenboot.spec

+16-11
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name: greenboot
66
Version: 0.4
7-
Release: 1%{?dist}
7+
Release: 2%{?dist}
88
Summary: Generic Health Check Framework for systemd
99
License: LGPLv2+
1010
URL: https://github.com/%{github_owner}/%{github_project}
@@ -20,38 +20,38 @@ Requires: systemd
2020

2121
%package motd
2222
Summary: Message of the Day updater for greenboot
23-
Requires: greenboot
23+
Requires: %{name} = %{version}-%{release}
2424
Requires: pam >= 1.3.1
2525
Requires: openssh
2626

2727
%description motd
2828
%{summary}.
2929

3030
%package ostree-grub2
31-
Summary: greenboot scripts for OSTree-based systems using the Grub2 bootloader
32-
Requires: greenboot
33-
Requires: greenboot-grub2
34-
Requires: greenboot-reboot
31+
Summary: Scripts for greenboot on OSTree-based systems using the Grub2 bootloader
32+
Requires: %{name} = %{version}-%{release}
33+
Requires: %{name}-grub2 = %{version}-%{release}
34+
Requires: %{name}-reboot = %{version}-%{release}
3535

3636
%description ostree-grub2
3737
%{summary}.
3838

3939
%package grub2
4040
Summary: Grub2 specific scripts for greenboot
41-
Requires: greenboot
41+
Requires: %{name} = %{version}-%{release}
4242

4343
%description grub2
4444
%{summary}.
4545

4646
%package reboot
4747
Summary: Reboot on red status for greenboot
48-
Requires: greenboot
48+
Requires: %{name} = %{version}-%{release}
4949

5050
%description reboot
5151
%{summary}.
5252

5353
%prep
54-
%setup -n %{github_project}-%{version}
54+
%setup -qn %{github_project}-%{version}
5555

5656
%build
5757

@@ -105,6 +105,8 @@ ln -snf /run/greenboot/motd %{buildroot}%{_sysconfdir}/motd.d/%{name}
105105
%{_unitdir}/greenboot-healthcheck.service
106106
%{_unitdir}/greenboot.service
107107
%{_unitdir}/redboot.service
108+
%dir %{_sysconfdir}/%{name}
109+
%dir %{_sysconfdir}/%{name}/check
108110
%dir %{_sysconfdir}/%{name}/check/required.d
109111
%{_sysconfdir}/%{name}/check/required.d/00_required_scripts_start.sh
110112
%dir %{_sysconfdir}/%{name}/check/wanted.d
@@ -116,8 +118,8 @@ ln -snf /run/greenboot/motd %{buildroot}%{_sysconfdir}/motd.d/%{name}
116118

117119
%files motd
118120
%dir /run/%{name}
119-
%config %{_sysconfdir}/motd.d/%{name}
120-
%{_sysconfdir}/%{name}/motd/
121+
%config(noreplace) %{_sysconfdir}/motd.d/%{name}
122+
%config %{_sysconfdir}/%{name}/motd/
121123
%{_sysconfdir}/%{name}/green.d/50_greenboot_motd.sh
122124
%{_sysconfdir}/%{name}/red.d/50_redboot_motd.sh
123125

@@ -131,5 +133,8 @@ ln -snf /run/greenboot/motd %{buildroot}%{_sysconfdir}/motd.d/%{name}
131133
%{_sysconfdir}/%{name}/red.d/99_reboot.sh
132134

133135
%changelog
136+
* Tue Oct 02 2018 Christian Glombek <[email protected]> - 0.4-2
137+
- Spec Review
138+
134139
* Thu Jun 14 2018 Christian Glombek <[email protected]> - 0.4-1
135140
- Initial Package

0 commit comments

Comments
 (0)