Accepting request 924876 from hardware

OBS-URL: https://build.opensuse.org/request/show/924876
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rasdaemon?expand=0&rev=16

_service

@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">rasdaemon</param>
-    <param name="revision">refs/heads/master</param>
+    <param name="revision">master</param>
     <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.git+%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
   </service>

_servicedata

@@ -1,6 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">git://git.infradead.org/users/mchehab/rasdaemon.git</param>
-              <param name="changesrevision">7ccf12f5ae26a055926d175d908c7930293438c4</param></service><service name="tar_scm">
+              <param name="changesrevision">7ccf12f5ae26a055926d175d908c7930293438c4</param></service></servicedata>
-                <param name="url">git://github.com/cobbler/cobbler.git</param>
-              <param name="changesrevision">3b6743562bd18900c2f299df2dc6a36c61dfd0ab</param></service></servicedata>

rasdaemon-0.6.7.18.git+7ccf12f.obscpio

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35cfd6973c2a4a1ff25ececfa604489f4d3b5fd50469ea1d50bdb88e4ebd5b84
+oid sha256:0bc38de76dbf0602e0bf36740faf688436b090084405499fb712784901094f6a
-size 762380
+size 763404

rasdaemon.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 12 13:36:44 UTC 2021 - trenn@suse.de
+
+- Add new /etc/sysconfig/rasdaemon config via fillup (bsc#1190668)
+
 -------------------------------------------------------------------
 Tue Aug 31 13:32:04 UTC 2021 - trenn@suse.de
 

rasdaemon.spec

@@ -29,6 +29,7 @@ BuildRequires:  automake
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
 BuildRequires:  sqlite3-devel
+Requires(pre):  %fillup_prereq
 Requires:       perl-DBD-SQLite
 %{?systemd_ordering}
 %ifnarch s390x
@@ -50,33 +51,26 @@ an utility for reporting current error counts from the EDAC sysfs files.
 
 %build
 autoreconf -fvi
-%configure \
+%configure --enable-all --with-sysconfdefdir=%{_fillupdir}
-  --enable-mce \
+CFLAGS="%{optflags}" make %{?_smp_mflags} V=1
-  --enable-aer \
-  --enable-sqlite3 \
-  --enable-extlog \
-  --enable-abrt-report \
-  --enable-arm \
-  --enable-non-standard \
-  --enable-hisi-ns-decode \
-  --enable-devlink \
-  --enable-diskerror
-make %{?_smp_mflags} V=1
 
 %install
 %make_install
+make install DESTDIR=%{buildroot}
 install -D -p -m 0644 misc/rasdaemon.service %{buildroot}%{_unitdir}/rasdaemon.service
-ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcrasdaemon
 install -D -p -m 0644 misc/ras-mc-ctl.service %{buildroot}%{_unitdir}/ras-mc-ctl.service
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcrasdaemon
 ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcras-mc-ctl
-install -D -p -m 0644 labels/dell %{buildroot}%{_sysconfdir}/ras/dimm_labels.d/dell
+rm INSTALL %{buildroot}/usr/include/*.h
-rm %{buildroot}%{_includedir}/*.h
 mkdir -p %{buildroot}%{_localstatedir}/lib/rasdaemon
+mkdir -p %{buildroot}%{_fillupdir}
+mv %{buildroot}%{_fillupdir}/rasdaemon %{buildroot}/%{_fillupdir}/sysconfig.rasdaemon
 
 %pre
 %service_add_pre rasdaemon.service ras-mc-ctl.service
 
 %post
+%fillup_only
 %service_add_post rasdaemon.service ras-mc-ctl.service
 
 %preun
@@ -97,6 +91,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/rasdaemon
 %dir %{_sysconfdir}/ras
 %dir %{_localstatedir}/lib/rasdaemon
 %ghost %{_localstatedir}/lib/rasdaemon/ras-mc_event.db
-%config %{_sysconfdir}/ras/dimm_labels.d
+%attr (644,root,root) %{_fillupdir}/sysconfig.rasdaemon
 
 %changelog