pwouters pushed to xca (epel7). "New upstream release"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 21:00:33 UTC 2015
From 104bef35575336778f2082c57e855200b462b83e Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <pm at datasphere.ch>
Date: Mon, 24 Nov 2014 15:00:07 +0100
Subject: New upstream release
diff --git a/.gitignore b/.gitignore
index fcfe70b..e16e240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xca-0.8.1.tar.gz
/xca-0.9.2.tar.gz
/xca-0.9.3.tar.gz
/xca-1.0.0.tar.gz
+/xca-1.1.0.tar.gz
diff --git a/sources b/sources
index 86ed61a..624fbce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e4e8b04047960cf984801e430a1703ab xca-1.0.0.tar.gz
-113ba37a89fe2de69338fcfe3b773a03 README.update
+645d3405938c97a3eb0450bbe20234c7 xca-1.1.0.tar.gz
+405ca7e03469736ca963407adf97f099 README.update
diff --git a/xca-1.0.0-nonstdext.patch b/xca-1.0.0-nonstdext.patch
deleted file mode 100755
index 3f29462..0000000
--- a/xca-1.0.0-nonstdext.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0baa9173eac0ebe568539e892792921b9ecf7279 Mon Sep 17 00:00:00 2001
-From: Christian Hohnstaedt <chohnstaedt at innominate.com>
-Date: Mon, 17 Nov 2014 16:15:42 +0100
-Subject: [PATCH] RedHat Bug #1164340 - segfault when viewing a RHEL entitlement certificate
-
-...in X509V3_EXT_get v3_lib.c:15
-
-Fix the x509v3ext copy constructor
----
- lib/x509v3ext.cpp | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
-index d94cbda..87bfc63 100644
---- a/lib/x509v3ext.cpp
-+++ b/lib/x509v3ext.cpp
-@@ -26,10 +26,9 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n)
-
- x509v3ext::x509v3ext(const x509v3ext &n)
- {
-- ext = NULL;
-- if (!n.isValid())
-- return;
-- set(n.ext);
-+ ext = X509_EXTENSION_new();
-+ if (n.ext && n.ext->value && n.ext->value->length > 0)
-+ set(n.ext);
- }
-
- x509v3ext::~x509v3ext()
---
-1.7.2.5
-
diff --git a/xca.spec b/xca.spec
index a811fe2..4d585f2 100644
--- a/xca.spec
+++ b/xca.spec
@@ -1,13 +1,12 @@
Summary: Graphical X.509 certificate management tool
Name: xca
-Version: 1.0.0
-Release: 2%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
License: BSD
Group: Applications/Productivity
URL: http://xca.hohnstaedt.de/
Source0: http://downloads.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
Source1: README.update
-Patch1: xca-1.0.0-nonstdext.patch
BuildRequires: qt4-devel openssl-devel
BuildRequires: xdg-utils
BuildRequires: ImageMagick
@@ -37,13 +36,6 @@ format, portable across operating systems.
%setup -q
-%patch1 -p1 -b .nonstdext
-
-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 -m 644 "%{SOURCE1}" ./
@@ -51,12 +43,10 @@ install -p -m 644 "%{SOURCE1}" ./
%build
#-------------------------------------------------------------------------------
-export QTDIR="%{_libdir}/qt4"
-CC='%{__cxx}' LD='%{__ld}' CFLAGS="${RPM_OPT_FLAGS} \
+%configure CXXFLAGS="${RPM_OPT_FLAGS} \
-DXCA_DEFAULT_QT_TRANSLATE=\"\\\"%{_datadir}/qt4/translations\\\"\"" \
- STRIP=: prefix="%{_prefix}" \
- LIBS="-Wl,-as-needed `pkg-config --libs QtGui`" \
- ./configure "`pwd`/"_tmp_root{,/usr}
+ STRIP=: \
+ LIBS="-Wl,-as-needed"
make %{?_smp_mflags}
convert img/xca.ico xca.png
@@ -69,8 +59,7 @@ touch -r img/xdb.ico xdb.png
%install
#-------------------------------------------------------------------------------
-make destdir="${RPM_BUILD_ROOT}" mandir=share/man install
-make destdir="${RPM_BUILD_ROOT}" mandir=share/man install.misc
+make destdir="${RPM_BUILD_ROOT}" install
# HACK: check whether workarounds below are still necessary
if test ! -e "${RPM_BUILD_ROOT}%{_datadir}/xca/crl.png"
@@ -100,6 +89,19 @@ desktop-file-install --mode 0644 \
--set-icon=xca \
"${RPM_BUILD_ROOT}%{_datadir}/applications/xca.desktop"
+# Will build the doc directory ourself.
+
+rm -rf "${RPM_BUILD_ROOT}%{_docdir}/xca"
+
+# Tag translation files.
+
+(
+ cd "${RPM_BUILD_ROOT}"
+ find '.%{_datadir}/xca' -name 'xca_[a-z][a-z].qm'
+) |
+ sed -e 's/^\.//' \
+ -e 's/.*\([a-z][a-z]\).qm$/%lang(\1) &/' > langfiles
+
#-------------------------------------------------------------------------------
%post
@@ -131,23 +133,18 @@ fi
#-------------------------------------------------------------------------------
-%files
+%files -f langfiles
#-------------------------------------------------------------------------------
%defattr(-, root, root, -)
%doc AUTHORS COPYRIGHT README.update
+%doc doc/*.html
%{_bindir}/*
+%exclude %{_bindir}/xca_db_stat
%dir %{_datadir}/xca
%{_datadir}/xca/*.png
%{_datadir}/xca/*.txt
-%{_datadir}/xca/*.html
%{_datadir}/xca/*.xca
-%lang(de) %{_datadir}/xca/xca_de.qm
-%lang(es) %{_datadir}/xca/xca_es.qm
-%lang(fr) %{_datadir}/xca/xca_fr.qm
-%lang(hr) %{_datadir}/xca/xca_hr.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}.*
@@ -159,6 +156,9 @@ fi
%changelog
#-------------------------------------------------------------------------------
+* Mon Nov 24 2014 Patrick Monnerat <pm at datasphere.ch> 1.1.0-1
+- New upstream release
+
* Mon Nov 17 2014 Patrick Monnerat <pm at datasphere.ch> 1.0.0-2
- Patch "nonstdext" avoids segfault when viewing cert with
non-standard extension.
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xca.git/commit/?h=epel7&id=104bef35575336778f2082c57e855200b462b83e
More information about the scm-commits
mailing list