diff --git a/.gitignore b/.gitignore index cfd69c1..7f85c08 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /mcelog-6e4e2a00.tar.bz2 /mcelog-f0d7654.tar.bz2 /mcelog-9bfaad8f92c5.tar.bz2 +/mcelog-119.tar.gz diff --git a/mcelog.spec b/mcelog.spec index 7b4a956..717cd8c 100644 --- a/mcelog.spec +++ b/mcelog.spec @@ -1,20 +1,19 @@ -%define last_git_commit 9bfaad8f92c5 +#define last_git_commit 9bfaad8f92c5 Summary: Tool to translate x86-64 CPU Machine Check Exception data Name: mcelog -Version: 101 -Release: 2.%{last_git_commit}%{?dist} +Version: 119 +Release: 1%{?dist} Epoch: 3 Group: System Environment/Base License: GPLv2 -Source0: mcelog-%{last_git_commit}.tar.bz2 +URL: https://github.com/andikleen/mcelog +Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # note that this source OVERRIDES the one on the tarball above! Source1: mcelog.conf Source2: mcelog.service Source10: mcelog.setup Patch0: mcelog-fix-trigger-path-and-cacheing.patch -URL: https://github.com/andikleen/mcelog.git -Buildroot: %{_tmppath}/%{name}-%{version}-root ExclusiveArch: i686 x86_64 Requires(post): systemd-units Requires(preun): systemd-units @@ -26,8 +25,7 @@ mcelog is a utility that collects and decodes Machine Check Exception data on x86-32 and x86-64 systems. It can be run either as a daemon, or by cron. %prep -%setup -q -n %{name}-%{last_git_commit} -%patch0 -p1 -b .fix-triggers-and-cacheing +%autosetup %build mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} @@ -37,8 +35,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir} make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,8} +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers mkdir -p $RPM_BUILD_ROOT/%{_unitdir} @@ -53,7 +50,8 @@ install -p -m755 triggers/page-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcel install -p -m755 triggers/socket-memory-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/socket-memory-error-trigger install -p -m755 mcelog.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly/mcelog.cron install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mcelog.service -install -p -m644 mcelog.8 $RPM_BUILD_ROOT/%{_mandir}/man8 +install -p -m644 mcelog*.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ +install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/ %clean rm -rf $RPM_BUILD_ROOT @@ -85,9 +83,12 @@ fi %{_sysconfdir}/mcelog/mcelog.setup %{_sysconfdir}/cron.hourly/mcelog.cron %{_unitdir}/mcelog.service -%attr(0644,root,root) %{_mandir}/*/* +%{_mandir}/*/* %changelog +* Wed Jan 27 2016 Zbigniew Jędrzejewski-Szmek - 3:119-1 +- Update to latest upstream tag + * Wed Jun 17 2015 Fedora Release Engineering - 3:101-2.9bfaad8f92c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index be78c22..9c586b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c0108c8a0db281f9cb4355c40b8ff126 mcelog-9bfaad8f92c5.tar.bz2 +19d26c5f279c58c99dd42ae7d065881e mcelog-119.tar.gz