rpms/xca/F-7 xca-0.6.3-locale.patch, NONE, 1.1 xca.spec, 1.16, 1.17 sources, 1.6, 1.7 xca-0.6.0-locale.patch, 1.1, NONE

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/xca/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11390/F-7

Modified Files:
	xca.spec sources 
Added Files:
	xca-0.6.3-locale.patch 
Removed Files:
	xca-0.6.0-locale.patch 
Log Message:
- updated to 0.6.3; rediffed patches
- fixed build



xca-0.6.3-locale.patch:

--- NEW FILE xca-0.6.3-locale.patch ---
2007-03-17  Enrico Scholz  <enrico.scholz at informatik.tu-chemnitz.de>
	* lib/main.c: use correct locale for the xca.qm file
	* lib/main.c: [SECURITY] do not load qt.qm file from current
	  directory

--- xca-0.6.3/lib/main.cpp.locale
+++ xca-0.6.3/lib/main.cpp
@@ -9,6 +9,7 @@
 #include <qtranslator.h>
 #include <qtextcodec.h>
 #include <qdir.h>
+#include <Qt/qlocale.h>
 #include <qtranslator.h>
 #include "widgets/MainWindow.h"
 #include "lib/func.h"
@@ -37,10 +38,9 @@ int main( int argc, char *argv[] )
 		default: locale="c";
 	}
 #else
-	locale = "C"; //QTextCodec::locale();
-#warning Fix locale
+	locale = QLocale::system().name();
 #endif
-	qtTr.load( QString( "qt_" ) + locale, "." );
+	qtTr.load( QString( "qt_" ) + locale, XCA_DEFAULT_TRANSLATE);
 	xcaTr.load( QString( "xca_" ) + locale, getPrefix() );
 
 	a.installTranslator( &qtTr );


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/F-7/xca.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xca.spec	9 Apr 2007 17:10:57 -0000	1.16
+++ xca.spec	14 Jun 2007 19:15:00 -0000	1.17
@@ -4,7 +4,7 @@
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.6.1
+Version:	0.6.3
 Release:	%release_func 1
 
 License:	BSD
@@ -12,7 +12,7 @@
 URL:		http://www.hohnstaedt.de/xca.html
 Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
 Source1:	README.update
-Patch0:		xca-0.6.0-locale.patch
+Patch0:		xca-0.6.3-locale.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt4-devel openssl-devel
 BuildRequires:	db4-devel
@@ -36,6 +36,7 @@
 mkdir -p _tmp_root/usr 	 
 ln -s /usr/%_lib	_tmp_root/usr/lib 	 
 ln -s /%_lib		_tmp_root/lib
+ln -s %_includedir/Qt	_tmp_root/include
 
 install -p -m644 %SOURCE1 '.'
 
@@ -75,7 +76,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYRIGHT CREDITS README.update
+%doc AUTHORS COPYRIGHT README.update
 %_bindir/*
 %attr(0644,root,root) %_mandir/*/*
 %dir %{_datadir}/xca
@@ -91,6 +92,10 @@
 
 
 %changelog
+* Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.3-1
+- updated to 0.6.3; rediffed patches
+- fixed build
+
 * Mon Apr  9 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.1-1
 - updated to 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xca/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Apr 2007 17:12:31 -0000	1.6
+++ sources	14 Jun 2007 19:15:00 -0000	1.7
@@ -1 +1 @@
-3755b7b3afd5f64ccf4cae377e4eb052  xca-0.6.1.tar.gz
+8e0c2f8fbd01451acb841a3fb99ca399  xca-0.6.3.tar.gz


--- xca-0.6.0-locale.patch DELETED ---