[bibletime/f17] sync/merge with master/ branch for real

[Rex Dieter]

commit 52d76bb21ed9efb166d87f810e4e4df6a2c1906a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Apr 26 07:28:07 2013 -0500

    sync/merge with master/ branch for real
    
    arg, botched that last merge/conflict good :(

 bibletime.spec |  102 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 64 insertions(+), 38 deletions(-)
---
diff --git a/bibletime.spec b/bibletime.spec
index 4176983..8ea3257 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -1,53 +1,61 @@
 Summary:	An easy to use Bible study tool
 Name:		bibletime
 Version:	2.9.1
-Release:	2%{?dist}
+Release:	6%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
-Group:		Applications/Productivity
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	cmake qt4-webkit-devel
+
+BuildRequires:	cmake
+BuildRequires:	pkgconfig(QtGui) >= 4.5.0
+BuildRequires:	pkgconfig(QtDBus) pkgconfig(QtXml)
+BuildRequires:	pkgconfig(QtWebKit)
 BuildRequires:	sword-devel >= 1.5.10 clucene-core-devel >= 2.0
-BuildRequires:	boost-devel openssl-devel curl-devel zlib-devel dbus-devel
+BuildRequires:	boost-devel openssl-devel dbus-devel
 BuildRequires:	desktop-file-utils gettext
 
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+
+## upstreamable patches
+# fix bibletime.desktop to pass validation
+Patch50: bibletime-2.9.1-dt_validate.patch
+# reduce linking to sword-related deps (curl, icu, zlib) which are not
+# needed on fedora.  May be upstreamable when/if we make FindSword.cmake
+# smarter (with at least some pkgconfig hints)
+Patch51:  bibletime-2.9.1-reduce_linking.patch
+
+## upstream patches
+# fixes display problems using qtwebkit-2.3+
+Patch0091: 0091-Fix-moveToAnchor-for-Qt5.patch
+
 %description
 BibleTime is a free and easy to use cross-platform bible study tool.
 
 BibleTime provides easy handling of digitalized texts (Bibles,
 commentaries and lexicons) and powerful features to work with these
 texts (search in texts, write own notes, save, print etc.).
-BibleTime is a frontend for the  SWORD Bible Framework.
+BibleTime is a frontend for the SWORD Bible Framework.
 
 %prep
 %setup -q
 
+%patch50 -p1 -b .dt_validate
+%patch51 -p1 -b .reduce_linking
+%patch0091 -p1 -b .0091
+
+
 %build
-mkdir fedora
-cd fedora
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-export FFLAGS="%{optflags}"
-%ifarch x86_64 ppc64
-%define lib_suffix 64
-%else
-%define lib_suffix %{nil}
-%endif
-cmake	-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix}	\
-	-DCMAKE_SKIP_RPATH:BOOL=ON -DLIB_SUFFIX=%{lib_suffix} ..
-make VERBOSE=1 %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+  -DCMAKE_BUILD_TYPE=Release \
+  ..
+popd
 
-%install
-%{__rm} -rf %{buildroot}
-cd fedora
-make DESTDIR=%{buildroot} install
+make %{?_smp_mflags} -C %{_target_platform}
 
-desktop-file-install					\
-	--dir=%{buildroot}%{_datadir}/applications	\
-	--remove-category=QT				\
-	--delete-original				\
-	%{buildroot}%{_datadir}/applications/%{name}.desktop
+%install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # rename wrongly-named locale
 mv %{buildroot}%{_datadir}/%{name}/locale/bibletime_ui_pt_{br,BR}.qm || :
@@ -63,26 +71,44 @@ for doctype in handbook howto ; do
 	done
 done
 
-%clean
-%{__rm} -rf %{buildroot}
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop
 
-%files -f fedora/%{name}.lang
-%defattr(-,root,root,-)
+%files -f %{name}.lang
 %{_bindir}/bibletime
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/bibletime.desktop
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/docs/
+%dir %{_datadir}/%{name}/docs/handbook/
+%dir %{_datadir}/%{name}/docs/howto/
 %{_datadir}/%{name}/display-templates/
 %{_datadir}/%{name}/javascript/
 %{_datadir}/%{name}/license/
-%{_datadir}/%{name}/icons
-%{_datadir}/%{name}/locale
-%{_datadir}/%{name}/pics
+%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/locale/
+%{_datadir}/%{name}/pics/
 %{_datadir}/icons/bibletime.svg
 %doc ChangeLog README LICENSE
 
 %changelog
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-2
-- Rebuilt for c++ ABI breakage
+* Fri Apr 19 2013 Rex Dieter <rdieter at fedoraproject.org> 2.9.1-6
+- No text visible in main window when using qtwebkit-2.3 (#952390)
+
+* Thu Apr 18 2013 Rex Dieter <rdieter at fedoraproject.org> - 2.9.1-5
+- clean .spec of deprecated tags (Group, %%clean, %%defattr)
+- use %%cmake macro
+- drop extraneous explicit sword-related deps (curl, zlib)
+- bibletime.desktop: don't remove Qt category, patch to pass validation
+- fix unowned dirs %%_datadir/bibletime/docs/{handbook,howto}
+
+* Sun Feb 03 2013 Kevin Fenzi <kevin at scrye.com> - 2.9.1-4
+- Rebuild for broken deps in rawhide
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun May 20 2012 Deji Akingunola <dakingun at gmail.com> - 2.9.1-2
+- Rebuild for icu soname change
 
 * Thu Feb 23 2012 Deji Akingunola <dakingun at gmail.com> - 2.9.1-1
 - Update to 2.9.1