pwouters pushed to xca (epel7). "updated to 0.6.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 20:58:34 UTC 2015
From 4b9f5dae64073818007e9b7f6a79828a8a1c73b5 Mon Sep 17 00:00:00 2001
From: ensc <ensc at fedoraproject.org>
Date: Sat, 17 Mar 2007 17:09:19 +0000
Subject: updated to 0.6.0
diff --git a/README.update b/README.update
new file mode 100644
index 0000000..cdf62b4
--- /dev/null
+++ b/README.update
@@ -0,0 +1,7 @@
+xca-0.6 uses a different database format. To convert the existing
+database, execute:
+
+1. Install 'db_dump' from the db4-utils package:
+ | yum install db4-utils
+
+2. Read /usr/share/xca/xca-2.html for further instructions
diff --git a/sources b/sources
index 47bce44..1efb0f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24e0289c189b8db2f1f15a4ddac1b1c3 xca-0.5.1.tar.gz
+9f683408a35630217e4f5250f1d14ff4 xca-0.6.0.tar.gz
diff --git a/xca-0.6.0-locale.patch b/xca-0.6.0-locale.patch
new file mode 100644
index 0000000..a395309
--- /dev/null
+++ b/xca-0.6.0-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.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.spec b/xca.spec
index de5b466..e02441d 100644
--- a/xca.spec
+++ b/xca.spec
@@ -1,27 +1,23 @@
-## $Id: xca.spec,v 1.12 2006/02/18 11:50:35 ensc Exp $
+## $Id: xca.spec,v 1.13 2006/09/15 17:52:07 ensc Exp $
%{!?release_func:%global release_func() %1%{?dist}}
Summary: Graphical X.509 certificate management tool
Name: xca
-Version: 0.5.1
-Release: %release_func 6
+Version: 0.6.0
+Release: %release_func 1
License: BSD
Group: Applications/Productivity
URL: http://www.hohnstaedt.de/xca.html
Source0: http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
-Patch0: %name-0.5.1-langinst.patch
-# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
-Patch1: %name-0.5.1-gcc4.patch
-Patch2: %name-0.5.1-db43.patch
-Patch3: %name-0.5.1-gcc41.patch
-Patch4: %name-0.5.1-openssl098.patch
-Patch5: %name-0.5.1-sha1.patch
+Source1: README.update
+Patch0: xca-0.6.0-locale.patch
BuildRoot: %_tmppath/%name-%version-%release-buildroot
-BuildRequires: qt-devel openssl-devel
-BuildRequires: /usr/include/db.h
+BuildRequires: qt4-devel openssl-devel
+BuildRequires: db4-devel
BuildRequires: desktop-file-utils
+BuildRequires: ImageMagick
%description
@@ -35,38 +31,37 @@ PEM, DER, PKCS#8.
%prep
%setup -q
-%patch0 -p0 -b .langinst
-%patch1 -p2 -b .gcc4
-%patch2 -p1 -b .db43
-%patch3 -p1 -b .gcc41
-%patch4 -p1 -b .openssl098
-%patch5 -p1 -b .sha1
+%patch0 -p1 -b .locale
-dblibs=$(echo /usr/%_lib/libdb_cxx*.so | tac | sed -e 's!.*lib\(db[^ ]*\)\.so!\1!g')
-sed -i "s! db_cxx-4 ! ${dblibs} !g" configure
-
-mkdir -p _tmp_root/usr
-ln -s /usr/%_lib _tmp_root/usr/lib
-ln -s /%_lib _tmp_root/lib
+install -p -m644 %SOURCE1 '.'
%build
-test -n "$QTDIR" || . %_sysconfdir/profile.d/qt.sh
-CC='%__cc' LD='%__ld' CFLAGS="$RPM_OPT_FLAGS" STRIP=: prefix=%_prefix \
-./configure `pwd`/_tmp_root{,/usr}
+#test -n "$QTDIR" || . %_sysconfdir/profile.d/qt.sh
+export QTDIR=%_libdir/qt4
+CC='%__cc' LD='%__ld' CFLAGS="$RPM_OPT_FLAGS -DXCA_DEFAULT_TRANSLATE=\\\"%_datadir/qt4/translations\\\"" STRIP=: prefix=%_prefix \
+./configure %_libdir
%__make %{?_smp_mflags}
-lrelease xca.pro
+
+convert img/xca.ico xca.png
%install
rm -rf "$RPM_BUILD_ROOT"
-%__make destdir="$RPM_BUILD_ROOT" mandir=share/man install
-%__install -d -m755 $RPM_BUILD_ROOT%_datadir/applications
+make destdir="$RPM_BUILD_ROOT" mandir=share/man install
+make destdir="$RPM_BUILD_ROOT" mandir=share/man install -C misc TOPDIR=..
+
+# HACK: check whether workarounds below are still necessary
+test ! -e $RPM_BUILD_ROOT%_datadir/xca/crl.png
-desktop-file-install --vendor fedora -m644 --delete-original \
+install -d -m755 $RPM_BUILD_ROOT%_datadir/{applications,pixmaps}
+install -p -m644 img/*.png $RPM_BUILD_ROOT%_datadir/xca
+install -p -m644 xca.png $RPM_BUILD_ROOT%_datadir/pixmaps/
+
+desktop-file-install --vendor fedora --mode 0644 \
--dir $RPM_BUILD_ROOT%_datadir/applications \
- --add-category X-Fedora \
+ --delete-original \
$RPM_BUILD_ROOT%_datadir/applications/xca.desktop
@@ -76,15 +71,15 @@ rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYRIGHT
-%doc debian/changelog
+%doc AUTHORS COPYRIGHT CREDITS README.update
%_bindir/*
-%_mandir/*/*
+%attr(0644,root,root) %_mandir/*/*
%dir %{_datadir}/xca
%_datadir/xca/*.png
%_datadir/xca/*.txt
%_datadir/xca/*.html
-%_datadir/pixmaps/*.xpm
+%_datadir/xca/*.xca
+%_datadir/pixmaps/*.png
%lang(de) %_datadir/xca/xca_de.qm
%lang(es) %_datadir/xca/xca_es.qm
@@ -92,6 +87,10 @@ rm -rf "$RPM_BUILD_ROOT"
%changelog
+* Sat Mar 17 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.0-1
+- updated to 0.6.0
+- removed old patches
+
* Fri Sep 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1-6
- rebuilt
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xca.git/commit/?h=epel7&id=4b9f5dae64073818007e9b7f6a79828a8a1c73b5
More information about the scm-commits
mailing list