From 8835566ff142f50579a78c42385ce42dee0d637c Mon Sep 17 00:00:00 2001
From: Peter Oliver <git@mavit.org.uk>
Date: Sep 22 2018 11:50:26 +0000
Subject: Update to version 2.40


Drop keepass-doc subpackage, since we need Python 2 to build it.

---

diff --git a/keepass.spec b/keepass.spec
index d57039e..2db35c9 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
 Name:           keepass
-Version:        2.39.1
-Release:        2%{?dist}
+Version:        2.40
+Release:        1%{?dist}
 Summary:        Password manager
 
 License:        GPLv2+
@@ -17,24 +17,18 @@ Patch0:         keepass-desktop-integration.patch
 # Move XSL files to /usr/share/keepass:
 Patch1:         keepass-fix-XSL-search-path.patch
 
-# Locate locally-installed help files:
-Patch2:         keepass-enable-local-help.patch
-
 ExclusiveArch:  %{mono_arches}
 BuildRequires:  ImageMagick
-BuildRequires:  archmage
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
 BuildRequires:  libgdiplus-devel
 BuildRequires:  mono-devel
 BuildRequires:  mono-winforms
 BuildRequires:  mono-web
-BuildRequires:  python2-devel
 BuildRequires:  xorg-x11-server-Xvfb
 Requires:       xdotool xsel hicolor-icon-theme
 Recommends:     gtk2
 Recommends:     libgcrypt
-Suggests:       keepass-doc
 
 
 # The debuginfo package would be empty if created.
@@ -65,7 +59,6 @@ for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
     xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
 done
 xbuild /target:KeePass /property:Configuration=Release
-%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
 
 
 %install
@@ -86,7 +79,6 @@ install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
 install -p dist/%{name} %{buildroot}/%{_bindir}
 sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
 sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
-cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
 
 
 %check
@@ -114,20 +106,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
 %{_datadir}/appdata/%{name}.appdata.xml
 
 
-%package doc
-Summary:        Documentation for the KeePass password manager
-BuildArch: 	noarch
-Recommends:     keepass
-
-%description doc
-Documentation for KeePass, a free open source password manager.
-
-%files doc
-%dir %{_docdir}
-%doc %{_docdir}/%{name}/Chm/
-
-
 %changelog
+* Thu Sep 20 2018 Peter Oliver <rpm@mavit.org.uk> - 2.40-1
+- Update to version 2.40.
+- Drop keepass-doc subpackage, since we need Python 2 to build it.
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.39.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index a1bf4a1..c6e34e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.39.1.tar.xz) = 8aef18ace04bc633e565069215801b43eb6ce63eff693eff941d2d7ad8e6b026b8d469fcbbe897bb099ffb86d36197f76b6829a90951090e678754d80fd8d513
+SHA512 (keepass-2.40.tar.xz) = acd4fa94b668130fc512343632519270446a4bb14aea248ce1608805b4b819476ddddcc525a6769c147348e264963bda331001d7348f854611d08510018d5395