From 096f053bbac8a15053703d5eaae2a11908bad21d0f690c7657e57f486b748e90 Mon Sep 17 00:00:00 2001
From: Marguerite Su <i@marguerite.su>
Date: Thu, 7 Dec 2017 13:50:16 +0000
Subject: [PATCH] Accepting request 554946 from home:pluskalm

- Drop useless provides/obsoletes
- Use cmake macros
- Use source for url

OBS-URL: https://build.opensuse.org/request/show/554946
OBS-URL: https://build.opensuse.org/package/show/Education/bibletime?expand=0&rev=46
---
 bibletime-rpmlintrc |  3 +--
 bibletime.changes   |  7 ++++++
 bibletime.spec      | 56 ++++++++++++++++++---------------------------
 3 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/bibletime-rpmlintrc b/bibletime-rpmlintrc
index 2f39282..5d74982 100644
--- a/bibletime-rpmlintrc
+++ b/bibletime-rpmlintrc
@@ -1,3 +1,2 @@
-# "Teaching" should become part of our official desktop Categories
-# As it is listed on freedesktop.org
+# Education Teaching is valid category
 addFilter("invalid-desktopfile.*/usr/share/applications/bibletime.desktop")
diff --git a/bibletime.changes b/bibletime.changes
index 7238e57..f785581 100644
--- a/bibletime.changes
+++ b/bibletime.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec  7 08:13:10 UTC 2017 - mpluskal@suse.com
+
+- Drop useless provides/obsoletes
+- Use cmake macros
+- Use source for url
+
 -------------------------------------------------------------------
 Tue Dec  5 21:30:36 UTC 2017 - cornelis@solcon.nl
 
diff --git a/bibletime.spec b/bibletime.spec
index 1451da3..bab1f71 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -24,16 +24,13 @@ Summary:        An easy to use Bible study tool
 License:        GPL-2.0+
 Group:          Productivity/Scientific/Other
 Url:            http://www.bibletime.info/
-Source0:        %name-%version.tar.xz
-Source2:        bibletime-rpmlintrc
-%if 0%{?suse_version} > 1325
-BuildRequires:  libboost_headers-devel
-%else
-BuildRequires:  boost-devel
-%endif
+Source0:        https://github.com/bibletime/bibletime/releases/download/v%{version}/bibletime-%{version}.tar.xz
+Source1:        bibletime-rpmlintrc
 BuildRequires:  cmake
 BuildRequires:  curl-devel
-BuildRequires:  sword-devel >= 1.7
+BuildRequires:  fdupes
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5LinguistTools)
@@ -43,19 +40,15 @@ BuildRequires:  cmake(Qt5WebKit)
 BuildRequires:  cmake(Qt5WebKitWidgets)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
-Provides:       %{name}-i18n = %version
-Obsoletes:      %{name}-devel < 1.7
-Obsoletes:      %{name}-i18n < 1.7
-Provides:       %{name}-devel = %version
-Provides:       sword-frontend
-
-BuildRequires:  clucene-core-devel
-BuildRequires:  fdupes
-BuildRequires:  pkg-config
-BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(libclucene-core)
+BuildRequires:  pkgconfig(sword) >= 1.7
 Recommends:     sword-bible
 Recommends:     sword-commentary
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_headers-devel
+%else
+BuildRequires:  boost-devel
+%endif
 
 %description
 BibleTime is a completely free Bible study program.
@@ -72,16 +65,12 @@ write own notes, save, print etc.).
 %setup -q
 
 %build
-mkdir build
-pushd build >/dev/null
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%{_prefix}" ../
-%{__make} %{?_smp_mflags}
-popd >/dev/null
+%cmake \
+  -Wno-dev
+%make_jobs
 
-%install 
-pushd build >/dev/null
-make install DESTDIR="%{buildroot}"
-popd >/dev/null
+%install
+%cmake_install
 # move the icon to a valid place (/usr/share/icons is not valid... it has to be in a theme; hicolor as the usual falback)
 # this is only a link pointing out of the icons
 rm %{buildroot}%{_datadir}/icons/%{name}.svg
@@ -89,16 +78,15 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
 mv %{buildroot}%{_datadir}/%{name}/icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 # then link back the icon into the app directory
 ln -sf %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{buildroot}%{_datadir}/%{name}/icons/%{name}.svg
-	%fdupes -s %{buildroot}
-	sed -i "s|bibletime/handbook/index.html|bibletime/handbook/en/index.html|" %{buildroot}%{_datadir}/applications/%{name}.desktop
-	%suse_update_desktop_file -r %{name} Education Teaching
+%fdupes -s %{buildroot}
+sed -i "s|bibletime/handbook/index.html|bibletime/handbook/en/index.html|" %{buildroot}%{_datadir}/applications/%{name}.desktop
+%suse_update_desktop_file -r %{name} Education Teaching
 
 %files
-%defattr(-,root,root)
-%dir %{_datadir}/bibletime
-/usr/bin/*
+%{_bindir}/bibletime
 %{_datadir}/icons/*
 %{_datadir}/applications/bibletime.desktop
+%dir %{_datadir}/bibletime
 %{_datadir}/bibletime/*
 
 %changelog