[packages/xca] - updated to 2.2.1, requires Qt5

bszx bszx at pld-linux.org
Sat Apr 25 16:08:21 CEST 2020


commit 14fcadba06a907678dc6bf6ed3e2c6c20a2352e1
Author: Bartek Szady <bszx at bszx.eu>
Date:   Sat Apr 25 16:04:34 2020 +0200

    - updated to 2.2.1, requires Qt5

 oids.patch    | 15 +++++++++++++++
 xca-doc.patch | 11 -----------
 xca.spec      | 37 +++++++++++++++++++------------------
 3 files changed, 34 insertions(+), 29 deletions(-)
---
diff --git a/xca.spec b/xca.spec
index 94ea4ed..72ac583 100644
--- a/xca.spec
+++ b/xca.spec
@@ -1,21 +1,22 @@
 Summary:	A GUI for handling X509 certificates, RSA keys, PKCS#10 Requests
 Summary(pl.UTF-8):	GUI do obsługi certyfikatów X509, kluczy RSA, żądań PKCS#10
 Name:		xca
-Version:	1.0.0
+Version:	2.2.1
 Release:	1
 Epoch:		1
 License:	BSD
 Group:		Applications/Communications
-Source0:	http://downloads.sourceforge.net/xca/%{name}-%{version}.tar.gz
-# Source0-md5:	e4e8b04047960cf984801e430a1703ab
-Patch0:		%{name}-doc.patch
-URL:		http://www.hohnstaedt.de/xca.html
-BuildRequires:	QtGui-devel >= 4.3.0
+Source0:	https://github.com/chris2511/xca/releases/download/RELEASE.%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	d9564be194d4e1e0b1139670f97a73d2
+Patch0:		oids.patch
+URL:		https://hohnstaedt.de/xca/
+BuildRequires:	Qt5Sql-devel >= 5.14.0
+BuildRequires:	Qt5Widgets-devel >= 5.14.0
 BuildRequires:	libltdl-devel
-BuildRequires:	openssl-devel >= 0.9.8
+BuildRequires:	openssl-devel >= 1.1.1
 BuildRequires:	pkgconfig
-BuildRequires:	qt4-build >= 4.3.0
-BuildRequires:	qt4-linguist >= 4.3.0
+BuildRequires:	qt5-build >= 5.14.0
+BuildRequires:	qt5-linguist >= 5.14.0
 BuildRequires:	sgml-tools
 BuildRequires:	sgml-tools-dtd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,13 +43,9 @@ Pokazywane jest drzewo certyfikatów.
 %patch0 -p1
 
 %build
-# Play non-standard build system:
-CFLAGS="%{rpmcxxflags}" \
-CXXFLAGS="%{rpmcxxflags}" \
-%{?__cc:CC="%{__cxx}"} \
-%{?__cxx:CXX="%{__cxx}"} \
-prefix="%{_prefix}" \
-./configure
+
+%configure \
+	--disable-doc
 
 %{__make} all
 
@@ -59,8 +56,11 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/xca,%{_desktopdir},%{_mandir}/
 %{__make} install \
 	destdir=$RPM_BUILD_ROOT
 
+%{__make} -C doc ENABLE_DOC="" install \
+	destdir=$RPM_BUILD_ROOT
+
 gzip -dc doc/xca.1.gz >$RPM_BUILD_ROOT%{_mandir}/man1/xca.1
-%{__rm} $RPM_BUILD_ROOT%{_prefix}/man/man1/xca.1.gz
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/xca.1.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,10 +73,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYRIGHT changelog doc/*.html
+%doc AUTHORS COPYRIGHT changelog
 %attr(755,root,root) %{_bindir}/xca
 %{_datadir}/xca
 %{_desktopdir}/xca.desktop*
 %{_mandir}/man1/xca.1*
+%{_docdir}/xca
 %{_datadir}/mime/packages/xca.xml
 %{_pixmapsdir}/xca-32x32.xpm
diff --git a/oids.patch b/oids.patch
new file mode 100644
index 0000000..8d4c6c1
--- /dev/null
+++ b/oids.patch
@@ -0,0 +1,15 @@
+--- xca-2.2.1/misc/oids.text.orig	2020-01-30 20:54:31.000000000 +0100
++++ xca-2.2.1/misc/oids.text	2020-04-25 15:25:30.483255049 +0200
+@@ -2,12 +2,10 @@
+ # OID  			short name      long name
+ 1.3.6.1.4.1.311.20.2:	dom:		Domain Controller
+ 1.3.6.1.4.1.311.21.1:	MsCaV:		Microsoft CA Version
+-1.3.6.1.4.1.311.20.2.3:	msUPN:		Microsoft Universal Principal Name
+ 1.3.6.1.4.1.311.10.3.4.1:msEFSFR:	Microsoft EFS File Recovery
+ 1.3.6.1.5.5.8.2.2:	iKEIntermediate: IP security end entity
+ 1.3.6.1.5.5.7.3.1:      serverAuth:	TLS Web Server Authentication
+ 1.3.6.1.5.5.7.3.2:      clientAuth:	TLS Web Client Authentication
+-1.3.6.1.4.1.311.20.2.2:	msSmartcardLogin: Microsoft Smartcardlogin
+ 2.5.4.44:		generationQualifier: generationQualifier
+ 2.5.4.45:		x500UniqueIdentifier: x500UniqueIdentifier
+ 2.5.4.65:		pseudonym:	pseudonym
diff --git a/xca-doc.patch b/xca-doc.patch
deleted file mode 100644
index 88e81d3..0000000
--- a/xca-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xca-0.9.3/doc/Makefile.old	2012-05-12 11:37:14.000000000 +0200
-+++ xca-0.9.3/doc/Makefile	2012-06-22 15:44:37.000000000 +0200
-@@ -18,7 +18,7 @@
- 	echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' > $@
- 	test ! -f xca-doc.tgz || tar zxf xca-doc.tgz
- 	@$(PRINT) "  DOC    [$(BASENAME)] $@"
--	$(LINUXDOC) -B html $< >/dev/null
-+	sgml2html $< >/dev/null
- 
- install: xca.1.gz xca.html
- 	install -m 755 -d $(destdir)$(docdir) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xca.git/commitdiff/14fcadba06a907678dc6bf6ed3e2c6c20a2352e1



More information about the pld-cvs-commit mailing list