From 898788a5d7e6c92ded1740df501f102d4c401a35e9a3b36a38c4223070b0ce47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Wed, 13 Jun 2018 22:18:11 +0000
Subject: [PATCH] Accepting request 616352 from
 home:iznogood:branches:GNOME:Apps

- Disable optional pkgconfig(libgoffice-0.8) BuildRequires, we do
  not want to depend on this compat package anymore.
- Enable cunit-devel BuildRequires and make check, run tests.
- Run spec-cleaner.

OBS-URL: https://build.opensuse.org/request/show/616352
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/grisbi?expand=0&rev=25
---
 grisbi.changes |  8 ++++++++
 grisbi.spec    | 20 +++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/grisbi.changes b/grisbi.changes
index fc8d2fb..6950f68 100644
--- a/grisbi.changes
+++ b/grisbi.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jun 12 16:14:26 UTC 2018 - bjorn.lie@gmail.com
+
+- Disable optional pkgconfig(libgoffice-0.8) BuildRequires, we do
+  not want to depend on this compat package anymore.
+- Enable cunit-devel BuildRequires and make check, run tests.
+- Run spec-cleaner.
+
 -------------------------------------------------------------------
 Mon Jun  4 07:04:11 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/grisbi.spec b/grisbi.spec
index 04f7316..2d87c81 100644
--- a/grisbi.spec
+++ b/grisbi.spec
@@ -2,7 +2,7 @@
 #
 # spec file for package grisbi
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -25,14 +25,16 @@ License:        GPL-2.0-or-later
 Group:          Productivity/Office/Finance
 URL:            http://www.grisbi.org
 Source:         http://downloads.sourceforge.net/project/grisbi/grisbi%20stable/1.0.x/%{name}-%{version}.tar.bz2
-# Needed for make check
-#BuildRequires:  cunit-devel
+
+BuildRequires:  cunit-devel
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(libgoffice-0.8)
+# Disabled as we do not want to depend on this old compat version - next major grisbi release will depend on new libgoffice
+#BuildRequires:  pkgconfig(libgoffice-0.8)
 BuildRequires:  pkgconfig(libofx)
 BuildRequires:  pkgconfig(libxml-2.0)
 Recommends:     %{name}-lang
@@ -45,13 +47,14 @@ if you spend a little time on the setup.
 One notable feature is that it respects French accounting rules.
 
 %lang_package
+
 %prep
 %setup -q
 
 %build
 %configure \
         --disable-static
-make %{?jobs:-j%{jobs}}
+make %{?_smp_mflags}
 
 %install
 %make_install
@@ -61,15 +64,14 @@ rm %{buildroot}%{_datadir}/mime-info/grisbi.{keys,mime}
 %find_lang %{name} %{?no_lang_C}
 %fdupes -s %{buildroot}%{_datadir}
 
-# We need cunit for this
-#%%check
-#make check
+%check
+make %{?_smp_mflags} check
 
 %files
 %license COPYING
 %doc AUTHORS NEWS README
 %{_bindir}/grisbi
-%doc %{_mandir}/man1/grisbi.1%{?ext_man}
+%{_mandir}/man1/grisbi.1%{?ext_man}
 %{_datadir}/applications/grisbi.desktop
 %{_datadir}/doc/grisbi/
 %{_datadir}/grisbi/