pbrobinson pushed to keepass (master). "2.29 plus mono 4 build fixes"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue May 19 13:16:27 UTC 2015


From 75b16329d8ad2eab246008a5820a0d1fde4dd5c6 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Tue, 19 May 2015 14:16:12 +0100
Subject: 2.29 plus mono 4 build fixes


diff --git a/.gitignore b/.gitignore
index 07c6bbb..ed4c5e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/keepass-2.26.tar.xz
-/keepass-2.27.tar.xz
+/keepass-*.tar.xz
diff --git a/keepass.spec b/keepass.spec
index 7053760..934c881 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
 Name:           keepass
-Version:        2.27
-Release:        5%{?dist}
+Version:        2.29
+Release:        1%{?dist}
 Summary:        Password manager
 
 License:        GPLv2+
@@ -21,7 +21,13 @@ Patch1:         keepass-fix-XSL-search-path.patch
 Patch2:         keepass-enable-local-help.patch
 
 ExclusiveArch:  %{mono_arches}
-BuildRequires:  mono-devel archmage desktop-file-utils python-devel
+BuildRequires:  archmage
+BuildRequires:  desktop-file-utils
+BuildRequires:  libgdiplus-devel
+BuildRequires:  mono-devel
+BuildRequires:  mono-winforms
+BuildRequires:  mono-web
+BuildRequires:  python-devel
 Requires:       xdotool xsel hicolor-icon-theme
 
 
@@ -43,6 +49,8 @@ to unlock the whole database.
 
 %build
 ( cd Build && sh PrepMonoDev.sh )
+find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
+find . -name "*.csproj" -print -exec sed -i 's#ToolsVersion="3.5"#ToolsVersion="4.0"#g; s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g; s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g' {} \;
 xbuild /target:KeePass /property:Configuration=Release
 %{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
 
@@ -78,8 +86,8 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
 
 %post
 /usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 
 %postun
@@ -110,7 +118,8 @@ Documentation for KeePass, a free open source password manager.
 
 
 %changelog
-* Mon May 18 2015 Peter Robinson <pbrobinson at fedoraproject.org> 2.27-5
+* Tue May 19 2015 Peter Robinson <pbrobinson at fedoraproject.org> 2.29-1
+- Update to 2.29
 - Rebuild (mono4)
 
 * Sat Oct 04 2014 Dan HorĂ¡k <dan[at]danny.cz> - 2.27-4
diff --git a/sources b/sources
index c4ba8d3..41c584a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a4e243b7f3784db99a3f5e3ede2493b  keepass-2.27.tar.xz
+d25a343d95d486cf338446203418bce0  keepass-2.29.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/keepass.git/commit/?h=master&id=75b16329d8ad2eab246008a5820a0d1fde4dd5c6


More information about the scm-commits mailing list