Accepting request 554650 from home:cornelisbb:branches:Education

please forward to Factory. Switch to Qt5 is necessary to keep this program in Factory.

OBS-URL: https://build.opensuse.org/request/show/554650
OBS-URL: https://build.opensuse.org/package/show/Education/bibletime?expand=0&rev=45

bibletime-2.10.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86d2d53913c08bce9f67c0d897639091d84e9d330527636cecd2b9008bf7ca91
-size 3252680

bibletime-2.11.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6e85ea0256e1abf1a9edb1b03596b4a8b51a20b252367d920431a3d2cf42ef0
+size 2438788

bibletime.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec  5 21:30:36 UTC 2017 - cornelis@solcon.nl
+
+- Update to 2.11.1:
+  * Details: https://github.com/bibletime/bibletime/releases
+- Swith to Qt5
+- Cleanup spec file: remove line for other distros.
+
 -------------------------------------------------------------------
 Wed Feb  1 09:59:34 UTC 2017 - adam.majer@suse.de
 

bibletime.spec

@@ -18,7 +18,7 @@
 
 
 Name:           bibletime
-Version:        2.10.1
+Version:        2.11.1
 Release:        0
 Summary:        An easy to use Bible study tool
 License:        GPL-2.0+
@@ -33,51 +33,29 @@ BuildRequires:  boost-devel
 %endif
 BuildRequires:  cmake
 BuildRequires:  curl-devel
-BuildRequires:  libqt4-devel
 BuildRequires:  sword-devel >= 1.7
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5LinguistTools)
+BuildRequires:  cmake(Qt5PrintSupport)
+BuildRequires:  cmake(Qt5Svg)
+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
-#
+
-# openSUSE
-#
-%if 0%{?suse_version}
 BuildRequires:  clucene-core-devel
 BuildRequires:  fdupes
-BuildRequires:  libQtWebKit-devel
 BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
 Recommends:     sword-bible
 Recommends:     sword-commentary
-%endif
-#
-# Fedora
-#
-%if 0%{?fedora_version}
-BuildRequires:  clucene-core-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  gcc-c++
-BuildRequires:  pkgconfig
-%if 0%{?fedora_version} > 11
-#BuildRequires:  webkitkde-devel
-BuildRequires:  qt-webkit-devel
-%else
-BuildRequires:  WebKit-qt-devel
-%endif
-%endif
-#
-# Mandriva
-#
-%if 0%{?mandriva_version}
-BuildRequires:  desktop-file-utils
-BuildRequires:  libclucene-devel
-BuildRequires:  pkgconfig
-%endif
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define         kdeprefix %{_prefix}
 
 %description
 BibleTime is a completely free Bible study program.
@@ -104,12 +82,6 @@ popd >/dev/null
 pushd build >/dev/null
 make install DESTDIR="%{buildroot}"
 popd >/dev/null
-# fix language pathnames
-test -d %{buildroot}%kdeprefix/share/locale/pt_br && mv %{buildroot}%kdeprefix/share/locale/pt_br %{buildroot}%kdeprefix/share/locale/pt_BR
-test -d %{buildroot}%kdeprefix/share/doc/HTML/pt-br && mv %{buildroot}%kdeprefix/share/doc/HTML/pt-br %{buildroot}%kdeprefix/share/doc/HTML/pt_BR
-# install manpages
-install -Dm644 docs/manpages/bibletime.1 %{buildroot}%{_mandir}/man1/bibletime.1
-install -Dm644 docs/manpages/bibletime.de.1 %{buildroot}%{_mandir}/de/man1/bibletime.1
 # 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
@@ -117,27 +89,16 @@ 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
-%if 0%{?suse_version}
 	%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
-%endif
-#
-%if 0%{?fedora_version} || 0%{?mandriva_version}
-install -Dm644 ./cmake/platforms/linux/bibletime.desktop.cmake %{buildroot}%{_datadir}/applications/bibletime.desktop
-%endif
-
-%clean
-rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc %{_mandir}/man1/bibletime.1*
+%dir %{_datadir}/bibletime
-%doc %{_mandir}/de/man1/bibletime.1*
+/usr/bin/*
-%dir %kdeprefix/share/bibletime
+%{_datadir}/icons/*
-%kdeprefix/bin/*
+%{_datadir}/applications/bibletime.desktop
-%kdeprefix/share/icons/*
+%{_datadir}/bibletime/*
-%kdeprefix/share/applications/bibletime.desktop
-%kdeprefix/share/bibletime/*
 
 %changelog