Hello community, here is the log from the commit of package bibletime for openSUSE:Factory checked in at 2017-12-14 10:54:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bibletime (Old) and /work/SRC/openSUSE:Factory/.bibletime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bibletime" Thu Dec 14 10:54:47 2017 rev:11 rq:555045 version:2.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/bibletime/bibletime.changes 2017-02-03 17:31:58.833281526 +0100 +++ /work/SRC/openSUSE:Factory/.bibletime.new/bibletime.changes 2017-12-14 10:54:52.159185888 +0100 @@ -1,0 +2,15 @@ +Thu Dec 7 08:13:10 UTC 2017 - [email protected] + +- Drop useless provides/obsoletes +- Use cmake macros +- Use source for url + +------------------------------------------------------------------- +Tue Dec 5 21:30:36 UTC 2017 - [email protected] + +- Update to 2.11.1: + * Details: https://github.com/bibletime/bibletime/releases +- Swith to Qt5 +- Cleanup spec file: remove line for other distros. + +------------------------------------------------------------------- Old: ---- bibletime-2.10.1.tar.xz New: ---- bibletime-2.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bibletime.spec ++++++ --- /var/tmp/diff_new_pack.X3gfyQ/_old 2017-12-14 10:54:52.879151132 +0100 +++ /var/tmp/diff_new_pack.X3gfyQ/_new 2017-12-14 10:54:52.883150939 +0100 @@ -18,67 +18,38 @@ Name: bibletime -Version: 2.10.1 +Version: 2.11.1 Release: 0 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: libqt4-devel -BuildRequires: sword-devel >= 1.7 -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: pkgconfig BuildRequires: update-desktop-files +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) +BuildRequires: pkgconfig(libclucene-core) +BuildRequires: pkgconfig(sword) >= 1.7 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 +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel %else -BuildRequires: WebKit-qt-devel -%endif -%endif -# -# Mandriva -# -%if 0%{?mandriva_version} -BuildRequires: desktop-file-utils -BuildRequires: libclucene-devel -BuildRequires: pkgconfig +BuildRequires: boost-devel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define kdeprefix %{_prefix} - %description BibleTime is a completely free Bible study program. @@ -94,22 +65,12 @@ %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 -# 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 +%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 @@ -117,27 +78,15 @@ 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} +%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) -%doc %{_mandir}/man1/bibletime.1* -%doc %{_mandir}/de/man1/bibletime.1* -%dir %kdeprefix/share/bibletime -%kdeprefix/bin/* -%kdeprefix/share/icons/* -%kdeprefix/share/applications/bibletime.desktop -%kdeprefix/share/bibletime/* +%{_bindir}/bibletime +%{_datadir}/icons/* +%{_datadir}/applications/bibletime.desktop +%dir %{_datadir}/bibletime +%{_datadir}/bibletime/* %changelog ++++++ bibletime-2.10.1.tar.xz -> bibletime-2.11.1.tar.xz ++++++ ++++ 415677 lines of diff (skipped) ++++++ bibletime-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.X3gfyQ/_old 2017-12-14 10:54:54.507072546 +0100 +++ /var/tmp/diff_new_pack.X3gfyQ/_new 2017-12-14 10:54:54.507072546 +0100 @@ -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")
