pwouters pushed to xca (epel7). "- updated to 0.6.3; rediffed patches (..more)"

[notifications at fedoraproject.org]

From 6c06670b0905d907ac606a2707300aa6182327c9 Mon Sep 17 00:00:00 2001
From: ensc <ensc at fedoraproject.org>
Date: Thu, 14 Jun 2007 19:14:58 +0000
Subject: - updated to 0.6.3; rediffed patches - fixed build


diff --git a/sources b/sources
index ad77331..b73c0e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3755b7b3afd5f64ccf4cae377e4eb052  xca-0.6.1.tar.gz
+8e0c2f8fbd01451acb841a3fb99ca399  xca-0.6.3.tar.gz
diff --git a/xca-0.6.0-locale.patch b/xca-0.6.0-locale.patch
deleted file mode 100644
index a395309..0000000
--- a/xca-0.6.0-locale.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.0/lib/main.cpp.locale 2007-03-16 20:34:51.000000000 +0100
-+++ xca-0.6.0/lib/main.cpp 2007-03-17 17:41:36.000000000 +0100
-@@ -51,6 +51,7 @@
- #include <Qt/qtranslator.h>
- #include <Qt/qtextcodec.h>
- #include <Qt/qdir.h>
-+#include <Qt/qlocale.h>
- #include <Qt/qtranslator.h>
- #include "widgets/MainWindow.h"
- #include "lib/func.h"
-@@ -79,10 +80,9 @@
- 		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 );
diff --git a/xca-0.6.3-locale.patch b/xca-0.6.3-locale.patch
new file mode 100644
index 0000000..9b438f3
--- /dev/null
+++ b/xca-0.6.3-locale.patch
@@ -0,0 +1,28 @@
+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 );
diff --git a/xca.spec b/xca.spec
index 45cb933..9b8e5a0 100644
--- a/xca.spec
+++ b/xca.spec
@@ -1,10 +1,10 @@
-## $Id: xca.spec,v 1.15 2007/03/17 17:33:57 ensc Exp $
+## $Id: xca.spec,v 1.16 2007/04/09 17:10:57 ensc Exp $
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 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 @@ Group:		Applications/Productivity
 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 @@ PEM, DER, PKCS#8.
 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 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %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 @@ rm -rf "$RPM_BUILD_ROOT"
 
 
 %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
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xca.git/commit/?h=epel7&id=6c06670b0905d907ac606a2707300aa6182327c9