pwouters pushed to xca (epel7). "New upstream release."
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 21:00:30 UTC 2015
From b937d0ef533cef35d4d32cd831ec50d5ddfe0b4f Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <pm at datasphere.ch>
Date: Tue, 28 Oct 2014 16:54:46 +0100
Subject: New upstream release.
diff --git a/.gitignore b/.gitignore
index de64401..fcfe70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xca-0.8.1.tar.gz
/xca-0.9.1.tar.gz
/xca-0.9.2.tar.gz
/xca-0.9.3.tar.gz
+/xca-1.0.0.tar.gz
diff --git a/sources b/sources
index 997fb6f..86ed61a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5e08cf8a93f023b1b3836c203bd0a694 xca-0.9.3.tar.gz
+e4e8b04047960cf984801e430a1703ab xca-1.0.0.tar.gz
113ba37a89fe2de69338fcfe3b773a03 README.update
diff --git a/xca-0.9.3-desktopicon.patch b/xca-0.9.3-desktopicon.patch
deleted file mode 100644
index 5fd97be..0000000
--- a/xca-0.9.3-desktopicon.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp xca-0.9.3.orig/misc/xca.desktop xca-0.9.3.new/misc/xca.desktop
---- xca-0.9.3.orig/misc/xca.desktop 2012-05-12 11:37:14.000000000 +0200
-+++ xca-0.9.3.new/misc/xca.desktop 2014-10-15 14:46:33.113592955 +0200
-@@ -7,7 +7,7 @@ Comment[de]=Eine graphische Oberfläche
- Comment[fi]=Graafinen X.509-varmenteiden hallintatyökalu
- Comment[fr]=Création et gestion de certificats conformes à la norme X.509
- Exec=xca %F
--Icon=xca-32x32.xpm
-+Icon=xca-32x32
- Terminal=false
- Categories=Application;Utility;Qt;
- MimeType=application/x-xca-database;application/x-xca-template;application/x-x509-ca-cert;application/pkcs10;application/x-pkcs7-certificates;application/x-pkcs12;
diff --git a/xca-0.9.3-french.patch b/xca-0.9.3-french.patch
deleted file mode 100644
index bf879ed..0000000
--- a/xca-0.9.3-french.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xca-0.9.3.orig/lang/fr.po xca-0.9.3.new/lang/fr.po
---- xca-0.9.3.orig/lang/fr.po 2012-05-12 11:37:14.000000000 +0200
-+++ xca-0.9.3.new/lang/fr.po 2012-05-14 14:33:27.386075980 +0200
-@@ -1883,7 +1883,7 @@
-
- #: PwDialog#2
- msgid ""
--"The password is parsed as 2-digit hex code. It must have an equal number of "
-+"The password is parsed as 2-digit hex code. It must have an even number of "
- "digits (0-9 and a-f)"
- msgstr ""
- "Le mot de passe doit être exprimé sous forme d'une suite de chiffres "
diff --git a/xca-0.9.3-openssl101i.patch b/xca-0.9.3-openssl101i.patch
deleted file mode 100644
index 828acdc..0000000
--- a/xca-0.9.3-openssl101i.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Oliver Winker <oliver at oli1170.net>
-Date: Tue, 12 Aug 2014 17:08:05 +0000 (+0200)
-Subject: Fix for openssl 1.0.1i
-X-Git-Url: http://gitweb.hohnstaedt.de/?p=projects%2Fxca.git;a=commitdiff_plain;h=4f7cd417320215c8ed3567536cbf2ca008946c38
-
-Fix for openssl 1.0.1i
-
-Fixes following application error
-
-Errors
-error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding
-error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error
-
-Due to openssl 1.0.1i change:
-
- commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291
- Author: Emilia Kasper <emilia at openssl.org>
- Date: Wed Jul 2 19:02:33 2014 +0200
-
-Commit messgae amended and
-Signed-off-by: Christian Hohnstaedt <chohnstaedt at innominate.com>
----
-
-diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
-index cf74c32..d94cbda 100644
---- a/lib/x509v3ext.cpp
-+++ b/lib/x509v3ext.cpp
-@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n)
- x509v3ext::x509v3ext(const x509v3ext &n)
- {
- ext = NULL;
-+ if (!n.isValid())
-+ return;
- set(n.ext);
- }
-
-@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
-
- bool x509v3ext::isValid() const
- {
-- return ext->value->length > 0 &&
-+ return ext && ext->value && ext->value->length > 0 &&
- OBJ_obj2nid(ext->object) != NID_undef;
- }
diff --git a/xca.spec b/xca.spec
index 318b4d9..cfe1fb4 100644
--- a/xca.spec
+++ b/xca.spec
@@ -1,15 +1,12 @@
Summary: Graphical X.509 certificate management tool
Name: xca
-Version: 0.9.3
-Release: 9%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
License: BSD
Group: Applications/Productivity
-URL: http://www.hohnstaedt.de/xca.html
+URL: http://xca.hohnstaedt.de/
Source0: http://downloads.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
Source1: README.update
-Patch1: xca-0.9.3-french.patch
-Patch2: xca-0.9.3-openssl101i.patch
-Patch3: xca-0.9.3-desktopicon.patch
BuildRequires: qt4-devel openssl-devel
BuildRequires: xdg-utils
BuildRequires: ImageMagick
@@ -33,12 +30,11 @@ DER, PKCS#8. All cryptographic data are stored in a byte order agnostic file
format, portable across operating systems.
+#-------------------------------------------------------------------------------
%prep
-%setup -q
+#-------------------------------------------------------------------------------
-%patch1 -p 1 -b .french
-%patch2 -p 1 -b .openssl101i
-%patch3 -p 1 -b .desktopicon
+%setup -q
mkdir -p _tmp_root/usr
ln -s "/usr/%{_lib}" _tmp_root/usr/lib
@@ -48,7 +44,10 @@ ln -s "%{_includedir}/Qt" _tmp_root/include
install -p -m 644 "%{SOURCE1}" ./
+#-------------------------------------------------------------------------------
%build
+#-------------------------------------------------------------------------------
+
export QTDIR="%{_libdir}/qt4"
CC='%{__cxx}' LD='%{__ld}' CFLAGS="${RPM_OPT_FLAGS} \
-DXCA_DEFAULT_QT_TRANSLATE=\"\\\"%{_datadir}/qt4/translations\\\"\"" \
@@ -62,12 +61,11 @@ touch -r img/xca.ico xca.png
convert img/xdb.ico xdb.png
touch -r img/xdb.ico xdb.png
-iconv -f iso8859-1 -t utf8 AUTHORS > AUTHORS.utf8
-touch -r AUTHORS AUTHORS.utf8
-mv AUTHORS.utf8 AUTHORS
-
+#-------------------------------------------------------------------------------
%install
+#-------------------------------------------------------------------------------
+
make destdir="${RPM_BUILD_ROOT}" mandir=share/man install
make destdir="${RPM_BUILD_ROOT}" mandir=share/man install.misc
@@ -87,33 +85,53 @@ xdg-icon-resource install --noupdate --context mimetypes \
--size 32 xdb.png application-x-xca-database
xdg-icon-resource install --noupdate --size 32 xca.png fedora-xca
+# Replace the desktop icon.
+rm -rf "${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xca-32x32.xpm"
+cp -a img/key.xpm "${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xca.xpm"
+
desktop-file-install --mode 0644 \
--dir "${RPM_BUILD_ROOT}%{_datadir}/applications" \
--delete-original \
--add-mime-type application/x-xca-database \
--remove-category QT \
+ --set-icon=xca \
"${RPM_BUILD_ROOT}%{_datadir}/applications/xca.desktop"
-
+#-------------------------------------------------------------------------------
%post
+#-------------------------------------------------------------------------------
+
touch --no-create %{_datadir}/icons/hicolor || :
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+
+#-------------------------------------------------------------------------------
%posttrans
+#-------------------------------------------------------------------------------
+
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database &> /dev/null || :
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+
+#-------------------------------------------------------------------------------
%postun
-if [ $1 -eq 0 ]; then
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+#-------------------------------------------------------------------------------
+
+if [ "${1}" -eq 0 ]
+then touch --no-create %{_datadir}/icons/hicolor || :
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+ touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
+
+#-------------------------------------------------------------------------------
%files
+#-------------------------------------------------------------------------------
+
+%defattr(-, root, root, -)
%doc AUTHORS COPYRIGHT README.update
%{_bindir}/*
%dir %{_datadir}/xca
@@ -124,6 +142,7 @@ fi
%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
@@ -133,7 +152,14 @@ fi
%attr(0644, root, root) %{_mandir}/*/*
+#-------------------------------------------------------------------------------
%changelog
+#-------------------------------------------------------------------------------
+
+* Tue Oct 28 2014 Patrick Monnerat <pm at datasphere.ch> 1.0.0-1
+- New upstream release.
+ Set-up a larger desktop icon.
+
* Wed Oct 15 2014 Patrick Monnerat <pm at datasphere.ch> 0.9.3-9
- Patch "openssl101i" for openssl-1.0.1i compatibility.
https://bugzilla.redhat.com/show_bug.cgi?id=1152043
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xca.git/commit/?h=epel7&id=b937d0ef533cef35d4d32cd831ec50d5ddfe0b4f
More information about the scm-commits
mailing list