From aa5b17ffa2c2d8b1a13df124d6002c5aaa42f350 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Jul 29 2019 10:11:52 +0000
Subject: Updated to latest Git snapshot with lots of Qt 5.12 crash fixes.


Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>

---

diff --git a/.gitignore b/.gitignore
index 5886991..eeff0af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ goldendict-415f35e.tar.gz
 /goldendict-eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa.tar.gz
 /goldendict-system-qtsingleapp.patch
 /goldendict-04d9dc43f67b102c7727228326c05eb82d87e4f2.tar.gz
+/goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz
diff --git a/goldendict.spec b/goldendict.spec
index 856f0b1..46e5935 100644
--- a/goldendict.spec
+++ b/goldendict.spec
@@ -1,10 +1,9 @@
 %global owner goldendict
-%global commit 04d9dc43f67b102c7727228326c05eb82d87e4f2
-%define __requires_exclude gstreamer1-plugins-bad-free
+%global commit 0f951b06a55f3a201891cf645a556e773bda5f52
 
 Name:		goldendict
 Version:	1.5
-Release:	0.20.RC2%{?dist}
+Release:	0.21.RC2%{?dist}
 Summary:	A feature-rich dictionary lookup program
 License:	GPLv3+
 URL:		http://goldendict.org
@@ -26,7 +25,7 @@ BuildRequires:	libXtst-devel
 BuildRequires:	hunspell-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	phonon-devel
+BuildRequires:	phonon-qt5-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	lzo-devel
 BuildRequires:	libtiff-devel
@@ -34,6 +33,9 @@ BuildRequires:	eb-devel
 BuildRequires:	qtsingleapplication-qt5-devel
 BuildRequires:	libappstream-glib
 
+Requires:		qt5-qtsvg%{?_isa}
+Recommends:		%{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release}
+
 %description
 Goldendict is a feature-rich dictionary lookup program.
 The latest release has the following features:
@@ -44,6 +46,7 @@ Scan popup functionality.
 
 %package docs
 Summary: Documentation for %{name}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 BuildArch: noarch
 
 %description docs
@@ -55,60 +58,24 @@ rm -r qtsingleapplication
 sed -e '/qtsingleapplication.pri/d' -i %{name}.pro
 
 %build
-%qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player
+%qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro
 %make_build
 
 %install
 %make_install INSTALL_ROOT=%{buildroot}
 rm -rf %{buildroot}%{_datadir}/app-install
-desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-# Register as an application to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p %{buildroot}%{_datadir}/metainfo
-cat > %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->
-<!--
-EmailAddress: ikm@goldendict.org
-SentUpstream: 2014-09-18
--->
-<application>
-  <id type="desktop">goldendict.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <summary>Look up definitions</summary>
-  <description>
-    <p>
-      Goldendict is an application to look up the definitions of words. It has the ability to
-      query both dictionaries saved on your local machine, and to query online dictionaries and
-      encyclopedias such as Wikipedia, Wiktionary and Urban Dictionary.
-    </p>
-  </description>
-  <url type="homepage">http://goldendict.org/</url>
-  <screenshots>
-    <screenshot type="default">http://goldendict.org/screenshots/sprechen-wiktionary.png</screenshot>
-    <screenshot>http://goldendict.org/screenshots/damselfly-heady.png</screenshot>
-  </screenshots>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
-</application>
-EOF
 
 %check
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %files
 %license LICENSE.txt
 %doc README.md
 %{_bindir}/%{name}
-%{_datadir}/%{name}
-%{_datadir}/metainfo/%{name}.appdata.xml
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/locale
+%{_metainfodir}/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
@@ -116,6 +83,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.a
 %{_datadir}/%{name}/help
 
 %changelog
+* Mon Jul 29 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5-0.21.RC2
+- Updated to latest Git snapshot with lots of Qt 5.12 crash fixes.
+- SPEC cleanup.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-0.20.RC2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index d8ff4e1..f39aa25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (goldendict-04d9dc43f67b102c7727228326c05eb82d87e4f2.tar.gz) = dc55f4160c5e1dc47f77ea76381e82ac6b624c657f1f2d40237d6dfaff48fba95188ca588e0cfe3b0e34229261cd6148801beacba76c8d7da368a937238266a9
+SHA512 (goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz) = 5fb41240f767fcde7e6395a9e441560fc8a721d474f817cd804a4c8ad072808510ade8d448e38adc2c55e333f07f38893c65b0cf31878f2d9930d58b368ee470