[xca] * Tue Nov 8 2011 Patrick Monnerat <pm at datasphere.ch> 0.9.1-1 - New upstream release: all previous p

[Patrick Monnerat]

commit 202ae80603bace13e5cf01f661baf0c2bee707a0
Author: Patrick Monnerat <pm at datasphere.ch>
Date:   Tue Nov 8 14:02:16 2011 +0100

    * Tue Nov  8 2011 Patrick Monnerat <pm at datasphere.ch> 0.9.1-1
    - New upstream release: all previous patches included in new code.

 .gitignore             |    1 +
 sources                |    2 +-
 xca-0.9.0-french.patch | 3250 ------------------------------------------------
 xca-0.9.0-locale.patch |   20 -
 xca-0.9.0-noec.patch   |  303 -----
 xca.spec               |   18 +-
 6 files changed, 9 insertions(+), 3585 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71e4422..bbd733a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xca-0.8.1.tar.gz
 /xca-0.9.0.tar.gz
 /README.update
+/xca-0.9.1.tar.gz
diff --git a/sources b/sources
index 64ab1af..4ad2aff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ff6e23a0aac6a6d9d10b47d3f9856f1a  xca-0.9.0.tar.gz
+53926d86ba9fc251b59f0dd154f2e3db  xca-0.9.1.tar.gz
 113ba37a89fe2de69338fcfe3b773a03  README.update
diff --git a/xca.spec b/xca.spec
index b8b9a32..7a30193 100644
--- a/xca.spec
+++ b/xca.spec
@@ -2,17 +2,14 @@
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.9.0
-Release:	%release_func 2
+Version:	0.9.1
+Release:	%release_func 1
 
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
 Source0:	http://downloads.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
 Source1:	README.update
-Patch1:		xca-0.9.0-locale.patch
-Patch2:		xca-0.9.0-noec.patch
-Patch3:		xca-0.9.0-french.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	qt4-devel openssl-devel
 BuildRequires:	xdg-utils
@@ -41,9 +38,6 @@ format, portable across operating systems.
 
 %prep
 %setup -q
-%patch1 -p 1 -b .locale
-%patch2 -p 1 -b .noec
-%patch3 -p 1 -b .french
 
 mkdir -p _tmp_root/usr
 ln -s "/usr/%{_lib}" _tmp_root/usr/lib
@@ -52,8 +46,6 @@ ln -s "%{_includedir}/Qt" _tmp_root/include
 
 install -p -m 644 "%{SOURCE1}" ./
 
-sed -i -e 's!^Exec=.*!\0 %%F!' misc/xca.desktop
-
 
 %build
 #test -n "${QTDIR}" || . "%{_sysconfdir}/profile.d/qt.sh"
@@ -79,7 +71,7 @@ mv AUTHORS.utf8 AUTHORS
 rm -rf "${RPM_BUILD_ROOT}"
 
 make destdir="${RPM_BUILD_ROOT}" mandir=share/man install
-make destdir="${RPM_BUILD_ROOT}" mandir=share/man install -C misc TOPDIR=..
+make destdir="${RPM_BUILD_ROOT}" mandir=share/man install.misc
 
 # HACK: check whether workarounds below are still necessary
 if test ! -e "${RPM_BUILD_ROOT}%{_datadir}/xca/crl.png"
@@ -139,6 +131,7 @@ gtk-update-icon-cache "%{_datadir}/icons/hicolor" &> /dev/null || :
 %lang(es) %{_datadir}/xca/xca_es.qm
 %lang(fr) %{_datadir}/xca/xca_fr.qm
 %lang(ru) %{_datadir}/xca/xca_ru.qm
+%lang(tr) %{_datadir}/xca/xca_tr.qm
 %{_datadir}/pixmaps/*.xpm
 %{_datadir}/icons/*/*/*/*.png
 %{_datadir}/mime/packages/%{name}.*
@@ -147,6 +140,9 @@ gtk-update-icon-cache "%{_datadir}/icons/hicolor" &> /dev/null || :
 
 
 %changelog
+* Tue Nov  8 2011 Patrick Monnerat <pm at datasphere.ch> 0.9.1-1
+- New upstream release: all previous patches included in new code.
+
 * Mon Feb 28 2011 Patrick Monnerat <pm at datasphere.ch> 0.9.0-2
 - Fix Exec parameter in desktop file.