Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Patrick Monnerat
8e38190fcd New upstream release.
New URL and source location.
"Modernize" spec file.
BR gcc-g++.
Fixes BZ #1568760.
2018-04-18 16:40:24 +02:00
Patrick Monnerat
24c0ba53a0 New upstream release 1.4.0.
Use qt5.
Remove obsolete rpm scriptlets.
Remove xca_db_stat from install.
2018-01-22 03:34:25 +01:00
Patrick Monnerat
ad86e7e1a7 Patch "openssl11" for OpenSSL 1.1 support. 2017-03-23 01:09:30 +01:00
4 changed files with 34 additions and 56 deletions

2
.gitignore vendored
View file

@ -7,3 +7,5 @@ xca-0.8.1.tar.gz
/xca-1.0.0.tar.gz
/xca-1.1.0.tar.gz
/xca-1.3.2.tar.gz
/xca-1.4.0.tar.gz
/xca-1.4.1.tar.gz

View file

@ -1 +1 @@
f9528164f46a78c7a2373778bc019c48 xca-1.3.2.tar.gz
SHA512 (xca-1.4.1.tar.gz) = 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42

View file

@ -1,13 +0,0 @@
diff -Naurp xca-1.3.2.orig/widgets/OidResolver.cpp xca-1.3.2.new/widgets/OidResolver.cpp
--- xca-1.3.2.orig/widgets/OidResolver.cpp 2015-10-10 14:54:12.000000000 +0200
+++ xca-1.3.2.new/widgets/OidResolver.cpp 2015-10-19 12:22:10.035130081 +0200
@@ -23,7 +23,8 @@ void OidResolver::searchOid(QString s)
bool ok;
int n;
- input->setText(s);
+ if (input->text() != s) // Avoid moving the cursor at end if unchanged.
+ input->setText(s);
s = s.trimmed();
n = s.toUInt(&ok);
if (!ok)

View file

@ -1,13 +1,15 @@
%global gitproject0 xca
%global gitowner0 chris2511
Summary: Graphical X.509 certificate management tool
Name: xca
Version: 1.3.2
Release: 3%{?dist}
Version: 1.4.1
Release: 1%{?dist}
License: BSD
Group: Applications/Productivity
URL: http://xca.hohnstaedt.de/
Source0: http://downloads.sourceforge.net/sourceforge/xca/%{version}/%{name}-%{version}.tar.gz
Patch1: xca-1.3.2-oidfieldcursor.patch
BuildRequires: qt4-devel openssl-devel
URL: https://hohnstaedt.de/xca/
Source0: https://github.com/%{gitowner0}/%{gitproject0}/releases/download/RELEASE.%{version}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: qt5-devel openssl-devel
BuildRequires: xdg-utils
BuildRequires: ImageMagick
BuildRequires: linuxdoc-tools
@ -35,15 +37,13 @@ format, portable across operating systems.
#-------------------------------------------------------------------------------
%setup -q
%patch1 -p 1 -b .oidfieldcursor
#-------------------------------------------------------------------------------
%build
#-------------------------------------------------------------------------------
%configure CXXFLAGS="${RPM_OPT_FLAGS} \
-DXCA_DEFAULT_QT_TRANSLATE=\"\\\"%{_datadir}/qt4/translations\\\"\"" \
%configure CXXFLAGS="${RPM_OPT_FLAGS}" \
STRIP=: \
LIBS="-Wl,-as-needed"
make %{?_smp_mflags}
@ -60,6 +60,9 @@ touch -r img/xdb.ico xdb.png
make destdir="${RPM_BUILD_ROOT}" install
# Do not include db statistics program and man.
find "${RPM_BUILD_ROOT}" -name 'xca_db_stat*' -delete
# HACK: check whether workarounds below are still necessary
if test ! -e "${RPM_BUILD_ROOT}%{_datadir}/xca/crl.png"
then install -d -m 755 \
@ -102,35 +105,6 @@ rm -rf "${RPM_BUILD_ROOT}%{_docdir}/xca"
-e 's/.*\([a-z][a-z]\).qm$/%lang(\1) &/' > langfiles
#-------------------------------------------------------------------------------
%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 || :
fi
#-------------------------------------------------------------------------------
%files -f langfiles
#-------------------------------------------------------------------------------
@ -139,7 +113,6 @@ fi
%doc AUTHORS COPYRIGHT
%doc doc/*.html
%{_bindir}/*
%exclude %{_bindir}/xca_db_stat
%dir %{_datadir}/xca
%{_datadir}/xca/*.png
%{_datadir}/xca/*.txt
@ -153,14 +126,30 @@ fi
#-------------------------------------------------------------------------------
%changelog
#-------------------------------------------------------------------------------
* Wed Apr 18 2018 Patrick Monnerat <patrick@monnerat.net> 1.4.1-1
- New upstream release.
- New URL and source location.
- "Modernize" spec file.
- BR gcc-g++.
Fixes BZ #1568760.
* Mon Jan 22 2018 Patrick Monnerat <patrick@monnerat.net> 1.4.0-1
- New upstream release 1.4.0.
- Use qt5.
- Remove obsolete rpm scriptlets.
- Remove xca_db_stat from install.
* Thu Mar 23 2017 Patrick Monnerat <patrick@monnerat.net> 1.3.2-4
- Patch "openssl11" for OpenSSL 1.1 support.
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
#-------------------------------------------------------------------------------
* Mon Oct 26 2015 Patrick Monnerat <patrick.monnerat@dh.com> 1.3.2-1
- New upstream release.
- Patch "oidfieldcursor" to restore normal cursor behavior on OID resolver