#3 Build 2.42.1 in EL7
Closed 2 years ago by tpokorra. Opened 2 years ago by dchen.
rpms/ dchen/keepass epel7  into  epel7

@@ -1,57 +0,0 @@ 

- From: Julian Taylor <jtaylor.debian@googlemail.com>

- Date: Tue, 12 Jul 2011 21:51:43 +0200

- Subject: enable local help

- 

- disable windows chm viewer and use x-www-browser to view docs

- located as html files in "/usr/share/doc/keepass2/Chm/help/"

- Forwarded: not-needed

- ---

-  KeePass/App/AppHelp.cs | 19 ++++++++-----------

-  1 file changed, 8 insertions(+), 11 deletions(-)

- 

- --- a/KeePass/App/AppHelp.cs

- +++ b/KeePass/App/AppHelp.cs

- @@ -58,7 +58,7 @@ namespace KeePass.App

-  			{

-  				if(m_strLocalHelpFile == null) return false;

-  

- -				try { return File.Exists(m_strLocalHelpFile); }

- +				try { return Directory.Exists(@"/usr/share/doc/keepass/Chm/help/"); }

-  				catch(Exception) { }

-  				return false;

-  			}

- @@ -114,14 +114,13 @@ namespace KeePass.App

-  		private static void ShowHelpLocal(string strTopic, string strSection)

-  		{

-  			Debug.Assert(m_strLocalHelpFile != null);

- -

- -			// Unblock CHM file for proper display of help contents

- -			WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);

- -

- -			string strCmd = "\"ms-its:" + m_strLocalHelpFile;

- +

- +			string strCmd = @"/usr/share/doc/keepass/Chm/help/";

-  

-  			if(strTopic != null)

- -				strCmd += @"::/help/" + strTopic + ".html";

- +				strCmd += strTopic + ".html";

- +			else

- +				strCmd += @"../index.html";

-  

-  			if(strSection != null)

-  			{

- @@ -129,12 +128,10 @@ namespace KeePass.App

-  				strCmd += @"#" + strSection;

-  			}

-  

- -			strCmd += "\"";

- -

- -			try { Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd); }

- +			try { Process.Start("x-www-browser", strCmd); }

-  			catch(Exception exStart)

-  			{

- -				MessageService.ShowWarning(@"hh.exe " + strCmd, exStart);

- +				MessageService.ShowWarning(@"x-www-browser " + strCmd, exStart);

-  			}

-  		}

-  

@@ -12,15 +12,15 @@ 

  

  --- a/KeePass/App/AppDefs.cs

  +++ b/KeePass/App/AppDefs.cs

- @@ -36,6 +36,8 @@ namespace KeePass.App

-  		public static readonly Color ColorControlDisabled = SystemColors.Control;

-  		public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);

+ @@ -44,6 +36,8 @@ namespace KeePass.App

+ 		public static readonly string PluginsDir = "Plugins";

+  		public static readonly string PluginProductName = "KeePass Plugin";

   

- +                public const string DebianDataDir = "/usr/share/keepass/";

+ +                public static readonly string DebianDataDir = "/usr/share/keepass/";

  +

-  		public const string XslFilesDir = "XSL";

-  		public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";

-  		public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";

+  		public static readonly string XslFilesDir = "XSL";

+  		public static readonly string XslFileHtmlLite = "KDBX_DetailsLite.xsl";

+  		public static readonly string XslFileHtmlFull = "KDBX_DetailsFull.xsl";

  --- a/KeePass/Forms/AboutForm.cs

  +++ b/KeePass/Forms/AboutForm.cs

  @@ -89,8 +89,7 @@ namespace KeePass.Forms

file modified
+10 -4
@@ -1,5 +1,5 @@ 

  Name:           keepass

- Version:        2.34

+ Version:        2.42.1

  Release:        1%{?dist}

  Summary:        Password manager

  
@@ -18,7 +18,7 @@ 

  Patch1:         keepass-fix-XSL-search-path.patch

  

  # Locate locally-installed help files:

- Patch2:         keepass-enable-local-help.patch

+ #Patch2:         keepass-enable-local-help.patch

  

  ExclusiveArch:  %{mono_arches}

  BuildRequires:  ImageMagick
@@ -31,6 +31,7 @@ 

  BuildRequires:  python-devel

  BuildRequires:  xorg-x11-server-Xvfb

  Requires:       xdotool xsel hicolor-icon-theme

+ Requires:       mono-winforms

  

  

  # The debuginfo package would be empty if created.
@@ -56,7 +57,7 @@ 

  ( 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

+ xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release

  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
@@ -67,7 +68,7 @@ 

  %install

  install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata

  install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}

- install -p -m 0644 Ext/XSL/KDBX_DetailsFull.xsl Ext/XSL/KDBX_DetailsLite.xsl Ext/XSL/KDBX_PasswordsOnly.xsl Ext/XSL/KDBX_Styles.css Ext/XSL/KDBX_Tabular.xsl Ext/XSL/TableHeader.gif %{buildroot}/%{_datadir}/%{name}/XSL

+ install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL

  install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png

  install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png

  install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
@@ -84,6 +85,8 @@ 

  sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt

  cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/

  

+ %check

+ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop

  

  %files

  %dir %{_docdir}
@@ -133,6 +136,9 @@ 

  

  

  %changelog

+ * Fri Jun 14 2019 Ding-Yi Chen <dchen@redhat.com> - 2.42.1-1

+ - Update to version 2.42.1.

+ 

  * Sun Aug 28 2016 Peter Oliver <rpm@mavit.org.uk> - 2.34-1

  - Update to version 2.34.

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- 8d939f55fa09e1d973dce43b35dd1373  keepass-2.34.tar.xz

+ SHA512 (keepass-2.42.1.tar.xz) = b28966e7fdfa330f47242309b78a6821252288e08dd670d2de10c96fb190169fb00e78c5aa3fe21a4254689dc348d1e384f59b2ff2259807bd2b3559cf4e9903

no initial comment

Thanks for the pull request, but I think it's simpler to fast-forward to the Rawhide version. Could you check that the build at https://copr.fedorainfracloud.org/coprs/mavit/keepass/ works okay for you?

I have tested keepass from your copr, and it works fine with CentOS7.
I have now built it, and initiated the update for Epel7: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2019-a3fdd184c6

Pull-Request has been closed by tpokorra

2 years ago