Skip to content

Commit

Permalink
misc/rasdaemon.spec.in: fix some issues on it
Browse files Browse the repository at this point in the history
Sort of sync this file from Fedora's upstream, addressing some
bugs sysfsdir install bugs.

After such change, the main difference would be that, in
Fedora, it uses different config settings, depending at the
architecture:

-%configure --enable-all --with-sysconfdefdir=%{_sysconfdir}/sysconfig
+%ifarch %{arm} aarch64
+%configure --enable-sqlite3 --enable-aer --enable-mce --enable-extlog --enable-devlink --enable-diskerror --enable-abrt-report --enable-non-standard --enable-arm --enable-hisi-ns-decode --with-sysconfdefdir=%{_sysconfdir}/sysconfig
+%else
+%configure --enable-sqlite3 --enable-aer --enable-mce --enable-extlog --enable-devlink --enable-diskerror --enable-abrt-report --with-sysconfdefdir=%{_sysconfdir}/sysconfig
+%endif

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
mchehab committed Apr 1, 2022
1 parent 993dd82 commit 6483a5f
Showing 1 changed file with 21 additions and 8 deletions.
29 changes: 21 additions & 8 deletions misc/rasdaemon.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ URL: http://git.infradead.org/users/mchehab/rasdaemon.git
Source0: http://www.infradead.org/~mchehab/rasdaemon/%{name}-%{version}.tar.bz2

ExcludeArch: s390 s390x
BuildRequires: make
BuildRequires: gcc
BuildRequires: gettext-devel
BuildRequires: perl-generators
Expand Down Expand Up @@ -38,14 +39,15 @@ an utility for reporting current error counts from the EDAC sysfs files.
%setup -q

%build
%configure --enable-all
%configure --enable-all --with-sysconfdefdir=%{_sysconfdir}/sysconfig

make %{?_smp_mflags}

%install
make install DESTDIR=%{buildroot}
install -D -p -m 0644 misc/rasdaemon.service %{buildroot}/%{_unitdir}/rasdaemon.service
install -D -p -m 0644 misc/rasdaemon.service %{buildroot}%{_unitdir}/rasdaemon.service
install -D -p -m 0644 misc/ras-mc-ctl.service %{buildroot}%{_unitdir}/ras-mc-ctl.service
install -D -p -m 0655 misc/rasdaemon.env %{buildroot}%{_sysconfdir}/sysconfig/%{name}
rm INSTALL %{buildroot}/usr/include/*.h

%files
Expand All @@ -55,11 +57,13 @@ rm INSTALL %{buildroot}/usr/include/*.h
%{_mandir}/*/*
%{_unitdir}/*.service
%{_sysconfdir}/ras/dimm_labels.d
@SYSCONFDEFDIR@/%{name}
%config(noreplace) @SYSCONFDEFDIR@/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}

%changelog

* Fri Apr 01 2022 Mauro Carvalho Chehab <[email protected]> 0.6.7-3
- Fix sysconfdir issues

* Wed May 26 2021 Mauro Carvalho Chehab <[email protected]> 0.6.7-1
- Bump to version 0.6.7 with several fixes and additions

Expand Down Expand Up @@ -105,17 +109,26 @@ rm INSTALL %{buildroot}/usr/include/*.h
* Sun Aug 10 2014 Mauro Carvalho Chehab <[email protected]> 0.5.3-1
- Bump to version 0.5.3 and enable ABRT and ExtLog

* Thu Apr 03 2014 Mauro Carvalho Chehab <[email protected]> 0.5.2-1
- fix and enable ABRT report support

* Fri Mar 28 2014 Mauro Carvalho Chehab <[email protected]> 0.5.1-1
- Do some fixes at the service files and add some documentation for --record

* Sun Feb 16 2014 Mauro Carvalho Chehab <[email protected]> 0.5.0-1
- Add experimental ABRT support

* Tue Sep 10 2013 Mauro Carvalho Chehab <[email protected]> 0.4.2-1
- Fix ras-mc-ctl layout filling

* Wed May 29 2013 Mauro Carvalho Chehab <mchehab[email protected]> 0.4.1-2
* Wed May 29 2013 Mauro Carvalho Chehab <mchehab@redhat.com> 0.4.1-2
- Fix the name of perl-DBD-SQLite package

* Wed May 29 2013 Mauro Carvalho Chehab <mchehab[email protected]> 0.4.1-1
* Wed May 29 2013 Mauro Carvalho Chehab <mchehab@redhat.com> 0.4.1-1
- Updated to version 0.4.1 with contains some bug fixes

* Tue May 28 2013 Mauro Carvalho Chehab <mchehab[email protected]> 0.4.0-1
* Tue May 28 2013 Mauro Carvalho Chehab <mchehab@redhat.com> 0.4.0-1
- Updated to version 0.4.0 and added support for mce, aer and sqlite3 storage

* Mon May 20 2013 Mauro Carvalho Chehab <mchehab[email protected]> 0.3.0-1
* Mon May 20 2013 Mauro Carvalho Chehab <mchehab@redhat.com> 0.3.0-1
- Package created

0 comments on commit 6483a5f

Please sign in to comment.