From 5ef076ad973dc27d2eaa0b9218f7bdf3c15075aa6cc9dcb923d5461dbb969d3d Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Mon, 10 Apr 2017 12:30:36 +0000
Subject: [PATCH] Accepting request 487024 from home:pluskalm:branches:hardware

Requires(post): systemd
Requires(postun): systemd
Requires(preun): systemd
- Switch to _service as fedorahosted is retired
- Update project url
- Use macro for systemd dependencies
- Make building more verbose
- Install provided labels for dell

OBS-URL: https://build.opensuse.org/request/show/487024
OBS-URL: https://build.opensuse.org/package/show/hardware/rasdaemon?expand=0&rev=13
---
 _service               | 14 +++++++++++++-
 _servicedata           |  4 ++++
 rasdaemon-0.5.8.tar.xz |  4 ++--
 rasdaemon.changes      |  9 +++++++++
 rasdaemon.spec         | 27 ++++++++++++++-------------
 5 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 _servicedata

diff --git a/_service b/_service
index fbbd978..406236a 100644
--- a/_service
+++ b/_service
@@ -1,3 +1,15 @@
 <services>
-  <service name="download_files" mode="disabled"/>
+  <service mode="disabled" name="tar_scm">
+    <param name="url">git://git.infradead.org/users/mchehab/rasdaemon.git</param>
+    <param name="scm">git</param>
+    <param name="changesgenerate">enable</param>
+    <param name="filename">rasdaemon</param>
+    <param name="revision">refs/tags/v0.5.8</param>
+    <param name="version">0.5.8</param>
+  </service>
+  <service mode="disabled" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service mode="disabled" name="set_version"/>
 </services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..de0da18
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">git://git.infradead.org/users/mchehab/rasdaemon.git</param>
+              <param name="changesrevision">113198d8918272e41a58aa09a7ac7dd1e0435417</param></service></servicedata>
\ No newline at end of file
diff --git a/rasdaemon-0.5.8.tar.xz b/rasdaemon-0.5.8.tar.xz
index 9333c00..c779dba 100644
--- a/rasdaemon-0.5.8.tar.xz
+++ b/rasdaemon-0.5.8.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ce935ed22d3772796d817a1c9e336629fee613169cbef9955870bf0da7c7d45
-size 95092
+oid sha256:457ab3da26047816af9fb3fda1876337fd16a137704594b26faf17ef7634d1b9
+size 95032
diff --git a/rasdaemon.changes b/rasdaemon.changes
index bc4fb82..f216c11 100644
--- a/rasdaemon.changes
+++ b/rasdaemon.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Apr 10 11:07:39 UTC 2017 - mpluskal@suse.com
+
+- Switch to _service as fedorahosted is retired
+- Update project url
+- Use macro for systemd dependencies
+- Make building more verbose
+- Install provided labels for dell
+
 -------------------------------------------------------------------
 Tue May 31 14:02:13 UTC 2016 - fvogt@suse.com
 
diff --git a/rasdaemon.spec b/rasdaemon.spec
index e1f114e..1c3a0eb 100644
--- a/rasdaemon.spec
+++ b/rasdaemon.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rasdaemon
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,22 +22,17 @@ Release:        0
 Summary:        Utility to receive RAS error tracings
 License:        GPL-2.0
 Group:          Hardware/Other
-Url:            https://git.fedorahosted.org/cgit/rasdaemon.git
-Source:         https://git.fedorahosted.org/cgit/rasdaemon.git/snapshot/%{name}-%{version}.tar.xz
+Url:            http://git.infradead.org/users/mchehab/rasdaemon.git
+Source:         %{name}-%{version}.tar.xz
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  gcc
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
-BuildRequires:  make
 BuildRequires:  sqlite3-devel
 BuildRequires:  systemd-rpm-macros
 Requires:       dmidecode
 Requires:       perl-DBD-SQLite
-Requires(post): systemd
-Requires(postun): systemd
-Requires(preun): systemd
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
 
 %description
 rasdaemon is a RAS (Reliability, Availability and Serviceability) logging tool.
@@ -54,15 +49,21 @@ an utility for reporting current error counts from the EDAC sysfs files.
 
 %build
 autoreconf -fvi
-%configure --enable-mce --enable-aer --enable-sqlite3 --enable-extlog --enable-abrt-report
-make %{?_smp_mflags}
+%configure \
+  --enable-mce \
+  --enable-aer \
+  --enable-sqlite3 \
+  --enable-extlog \
+  --enable-abrt-report
+make %{?_smp_mflags} V=1
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 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}/rcras-mc-ctl
+install -D -p -m 0644 labels/dell %{buildroot}%{_sysconfdir}/ras/dimm_labels.d/dell
 rm %{buildroot}%{_includedir}/*.h
 mkdir -p %{buildroot}%{_localstatedir}/lib/rasdaemon
 
@@ -90,6 +91,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/rasdaemon
 %dir %{_sysconfdir}/ras
 %dir %{_localstatedir}/lib/rasdaemon
 %ghost %{_localstatedir}/lib/rasdaemon/ras-mc_event.db
-%{_sysconfdir}/ras/dimm_labels.d
+%config %{_sysconfdir}/ras/dimm_labels.d
 
 %changelog