rpms/keepassx/F-7 keepass-0.2.2-htmlview.patch, NONE, 1.1 keepassx-0.2.2-helpurl.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 keepassx.spec, 1.1, 1.2 sources, 1.2, 1.3 keepass.gif, 1.1, NONE

Aurelien Bompard (abompard) fedora-extras-commits at redhat.com
Wed Jun 27 20:28:33 UTC 2007


Author: abompard

Update of /cvs/pkgs/rpms/keepassx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3049/F-7

Modified Files:
	.cvsignore keepassx.spec sources 
Added Files:
	keepass-0.2.2-htmlview.patch keepassx-0.2.2-helpurl.patch 
Removed Files:
	keepass.gif 
Log Message:
* Wed Jun 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.2.2-2
- fix help button
- use htmlview instead of the hardcoded konqueror


keepass-0.2.2-htmlview.patch:

--- NEW FILE keepass-0.2.2-htmlview.patch ---
--- ./src/PwmConfig.cpp.htmlview	2007-06-27 21:57:50.000000000 +0200
+++ ./src/PwmConfig.cpp	2007-06-27 21:58:06.000000000 +0200
@@ -50,7 +50,7 @@ BannerColor1=ParseColorString(ini.GetVal
 BannerColor2=ParseColorString(ini.GetValue("Options","BannerColor2","0,117,175").c_str());
 BannerTextColor=ParseColorString(ini.GetValue("Options","BannerTextColor","222,222,222").c_str());
 ShowPasswords=ini.GetValueB("Options","ShowPasswords",false);
-OpenUrlCommand=ini.GetValue("Options","UrlCmd","kfmclient openURL %1").c_str();
+OpenUrlCommand=ini.GetValue("Options","UrlCmd","htmlview %1").c_str();
 Language=ini.GetValue("Options","LangFile","").c_str();
 ParseBoolString(ini.GetValue("Options","SearchOptions",(const char*)defaultSearchOptions.toUtf8()).c_str(),defaultSearchOptions,SearchOptions,9);
 ListView_HidePasswords=ini.GetValueB("UI","HidePasswords",true);

keepassx-0.2.2-helpurl.patch:

--- NEW FILE keepassx-0.2.2-helpurl.patch ---
--- ./src/mainwindow.cpp.helpurl	2007-06-27 21:40:25.000000000 +0200
+++ ./src/mainwindow.cpp	2007-06-27 21:54:13.000000000 +0200
@@ -1013,7 +1013,7 @@ dlg.exec();
 }
 
 void KeepassMainWindow::OnHelpHandbook(){
-openBrowser(AppDir+"/../share/doc/keepass/index.html");
+openBrowser("http://keepassx.sourceforge.net");
 }
 
 void KeepassMainWindow::OnViewShowToolbar(bool show){


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/keepassx/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jun 2007 20:18:12 -0000	1.2
+++ .cvsignore	27 Jun 2007 20:27:57 -0000	1.3
@@ -1 +1,2 @@
 KeePassX-0.2.2.tar.gz
+KeePassX_logo_100x100.png


Index: keepassx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keepassx/F-7/keepassx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keepassx.spec	25 Jun 2007 20:18:12 -0000	1.1
+++ keepassx.spec	27 Jun 2007 20:27:57 -0000	1.2
@@ -1,19 +1,20 @@
 Name:           keepassx
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform password manager
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://keepassx.sourceforge.net
 Source0:        http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz
-# http://keepass.info/images/plockb75.gif
-Source1:        keepass.gif
+Source1:        http://keepassx.sourceforge.net/images/logos/KeePassX_logo_100x100.png
+Patch0:         keepass-0.2.2-htmlview.patch
+Patch1:         keepassx-0.2.2-helpurl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel > 4.1, libXtst-devel, ImageMagick, desktop-file-utils
 
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme, htmlview
 
 %description
 KeePassX is an application for people with extremly high demands on secure
@@ -35,6 +36,8 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .htmlview
+%patch1 -p0 -b .helpurl
 
 
 %build
@@ -118,5 +121,9 @@
 
 
 %changelog
+* Wed Jun 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.2.2-2
+- fix help button
+- use htmlview instead of the hardcoded konqueror
+
 * Sun Mar 04 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.2.2-1
 - initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/keepassx/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jun 2007 20:18:12 -0000	1.2
+++ sources	27 Jun 2007 20:27:57 -0000	1.3
@@ -1 +1,2 @@
 5ee945ab12c2667ef5c4013a0636c26f  KeePassX-0.2.2.tar.gz
+f3e94f6715798d1f241007e2f882dc0a  KeePassX_logo_100x100.png




More information about the fedora-extras-commits mailing list