From 7b1c40a71d0ff94c7969fdc13ef0339c1fb848dc Mon Sep 17 00:00:00 2001
From: Raphael Groner <raphgro@fedoraproject.org>
Date: Jul 29 2019 14:31:28 +0000
Subject: use latest git to apply recent fixes


---

diff --git a/.gitignore b/.gitignore
index 74c9853..0785174 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /trojita-8901a5c0465637e98bb998518ae644198d6728e2.tar.gz
 /trojita_common-po-20160612.tar.gz
 /trojita-0.7.tar.gz
+/trojita-90b417b131853553c94ff93aef62abaf301aa8f1.tar.gz
diff --git a/delay-test_Cryptography_PGP.patch b/delay-test_Cryptography_PGP.patch
deleted file mode 100644
index 8068011..0000000
--- a/delay-test_Cryptography_PGP.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/tests/Cryptography/test_Cryptography_PGP.cpp b/tests/Cryptography/test_Cryptography_PGP.cpp
-index 2d33a4d..19c1ad6 100644
---- a/tests/Cryptography/test_Cryptography_PGP.cpp
-+++ b/tests/Cryptography/test_Cryptography_PGP.cpp
-@@ -106,10 +106,12 @@ void CryptographyPGPTest::testDecryption()
- 
-     int i = 0;
-     while (data.isValid() && data.data(Imap::Mailbox::RolePartCryptoNotFinishedYet).toBool() && i++ < 1000) {
--        QTest::qWait(10);
-+        QTest::qWait(20);
-     }
-     // allow for event processing, so that the model can retrieve the results
-     QCoreApplication::processEvents();
-+    // ensure that we're done now
-+    QVERIFY(!data.data(Imap::Mailbox::RolePartCryptoNotFinishedYet).toBool());
- 
-     if (!qcaErrorSpy.isEmpty() && successful) {
-         qDebug() << "Unexpected failure in crypto";
diff --git a/sources b/sources
index a832ea3..7da2120 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (trojita-0.7.tar.gz) = f335b4a52942f0da609bf93350395a994645728add8eb1668293448f67c367b8dc9cbc46d22946f49131eb0b1dc7f19c38c85321678230c619529877cce9e0ee
+SHA512 (trojita-90b417b131853553c94ff93aef62abaf301aa8f1.tar.gz) = 1d90ceecfa2bb653a862233f2c5890dade0d523b70f4b035464c6ebf39fbcc220bac5bd6b33ef93dad3e398765bb325cc72929cf517277a57a543c7eabed48bf
 SHA512 (trojita_common-po-20160612.tar.gz) = 6cc737312e8d9c09833f7e900994e22ecf21bb0f976890bf78c8c45aa0187bc33231bb328ba182c7cdb5ab4674e7b3c1e9bf4daaf2c3b0a43fb529d545bc7b99
diff --git a/trojita.spec b/trojita.spec
index 9402cfa..479ef0f 100644
--- a/trojita.spec
+++ b/trojita.spec
@@ -1,30 +1,27 @@
 %bcond_with doxy
-# there's a strange bug with qtwebkit but not reproducible in rawhide/f27
-%if 0%{?fedora} < 27
-%bcond_with testsqtwebkit
-%endif
 
-#%%global gitdate 20160610
-#%%global commit0 8901a5c0465637e98bb998518ae644198d6728e2
+%global gitdate 20190618
+%global commit0 90b417b131853553c94ff93aef62abaf301aa8f1
 %global srcurl  https://github.com/jktjkt/%{name}
 
 Name:           trojita
 %if 0%{?gitdate}
-Version:        0.7
-Release:        0.15.%{gitdate}git%(c=%{commit0}; echo ${c:0:7} )%{?dist}.1
+
+Version:        0.7.0.1
+Release:        0.1.%{gitdate}git%(c=%{commit0}; echo ${c:0:7} )%{?dist}
 Source0:        %{srcurl}/archive/%{commit0}.tar.gz#/%{name}-%{commit0}.tar.gz
 %else
 Version:        0.7
-Release:        15%{?dist}
+Release:        1%{?dist}
 Source0:        %{srcurl}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 %endif
 # manually generated manpage with help2man
 # help2man -o trojita.1 --no-info --no-discard-stderr -h --version-string=0.6 /usr/bin/trojita
 #Source1:        trojita.1
 
-# python2 ./l10n-fetch-po-files.py ; tar czf %{name}_common-po-20160612.tar.gz po/
+# cd $SRCDIR ; python3 ./l10n-fetch-po-files.py ; tar czf ../%%{name}_common-po-20190729.tar.gz po/
 # calls svn to get latest po files
-Source10:       %{name}_common-po-20160612.tar.gz
+Source10:       %{name}_common-po-20190729.tar.gz
 
 ### upstream patches
 # Fix GPG test, otherwise b0rken with gnupg2 v2.1.16
@@ -34,7 +31,7 @@ Patch1:         %{srcurl}/commit/73a7b085454ca5b9d8f28529da26c54c5109678a.patch
 
 ## downstream patches
 # rhbz#1401716, increase timeout for CryptographyPGPTest::testDecryption
-Patch10:         delay-test_Cryptography_PGP.patch
+#Patch10:         delay-test_Cryptography_PGP.patch
 
 # Almost everything: dual-licensed under the GPLv2 or GPLv3
 # (with KDE e.V. provision for relicensing)
@@ -132,7 +129,8 @@ This application is heavily based on Qt and uses WebKit.
 
 %prep
 %if 0%{?gitdate}
-%setup -qn%{name}-%{commit0} -a10
+%setup -qn%{name}-%{commit0}
+#-a10
 %else
 %autosetup -p1 -a10
 %endif
@@ -158,29 +156,31 @@ doxygen src/Doxyfile
 
 %install
 %make_install -C %{_target_platform}
-%find_lang %{name}_common --with-qt
+#%find_lang %{name}_common --with-qt
 #install -m644 -p -D %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/*%{name}.desktop
 # appstream is not available in EPEL
 %if 0%{?fedora}
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*%{name}.appdata.xml
 %endif
 # do tests in some fake X
 #xvfb-run -a find %{_target_platform} -name test_\* -print -exec '{}' \;
 pushd %{_target_platform}
 xvfb-run -a %ctest
 
-%files -f %{name}_common.lang
+
+%files
+#-f %{name}_common.lang
 %license LICENSE
 %doc README src/Doxyfile
-#%%{_mandir}/man1/%{name}.1*
+#%%{_mandir}/man1/%%{name}.1*
 %{_libdir}/%{name}/
 %{_bindir}/%{name}
 %{_bindir}/be.contacts
-%{_datadir}/appdata/*.appdata.xml
+%{_datadir}/metainfo/*.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/32x32/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
@@ -201,6 +201,9 @@ Summary:   Documentation files for %{name}
 
 
 %changelog
+* Sun Jul 28 2019 Raphael Groner <projects.rg@smart.ms> - 0.7.0.1-0.1.20190618gitIcf4fda
+- use latest git snapshot with a bunch of fixes
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild