From e08bc318252cdb782a827b1f4de74ca7c4be49be Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Aug 16 2016 18:03:00 +0000 Subject: Pushing 2.11_rc2 --- diff --git a/.gitignore b/.gitignore index d3799a9..4b30951 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ bibletime-2.7.tar.gz /bibletime-2.9.1.tar.bz2 /bibletime-2.10.0.tar.xz /bibletime-2.10.1.tar.xz +/bibletime-2.11_rc2.tar.xz diff --git a/bibletime.spec b/bibletime.spec index 9fcb949..da5457c 100644 --- a/bibletime.spec +++ b/bibletime.spec @@ -1,12 +1,10 @@ Name: bibletime -Version: 2.10.1 -Release: 13%{?dist} +Version: 2.11_rc2 +Release: 1%{?dist} Summary: An easy to use Bible study tool License: GPLv2 URL: http://www.bibletime.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz -# Replaces -fpie with -fPIE to fix build on s390 -Patch0: flags.patch BuildRequires: boost-devel BuildRequires: clucene-core-devel >= 2.0 BuildRequires: cmake @@ -15,10 +13,11 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: openssl-devel BuildRequires: pkgconfig(QtGui) >= 4.5.0 -BuildRequires: pkgconfig(QtDBus) -BuildRequires: pkgconfig(QtXml) -BuildRequires: pkgconfig(QtWebKit) BuildRequires: sword-devel >= 1.7.0 +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-linguist +BuildRequires: qt5-qtwebengine-devel +BuildRequires: qt5-qtsvg-devel %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} @@ -31,7 +30,6 @@ the SWORD Bible Framework. %prep %setup -q -%patch0 -p1 -b .flags %build mkdir -p %{_target_platform} @@ -62,7 +60,7 @@ done desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop %files -f %{name}.lang -%doc ChangeLog LICENSE README +%doc ChangeLog LICENSE README.md %{_bindir}/bibletime %{_datadir}/applications/bibletime.desktop %dir %{_datadir}/%{name} @@ -78,6 +76,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop %{_datadir}/icons/bibletime.svg %changelog +* Tue Aug 16 2016 Greg Hellings - 2.11_rc2-1 +- New upstream test build + * Wed Feb 03 2016 Fedora Release Engineering - 2.10.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index bfe0dee..12432e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef4d189d53fd1608c56f4827947ffcf0 bibletime-2.10.1.tar.xz +088988723ccf0c141669f00ab9f31f6e bibletime-2.11_rc2.tar.xz