Accepting request 671128 from home:namtrac:branches:security

- Cleanup spec file
- Use Qt5
- Refresh patches

OBS-URL: https://build.opensuse.org/request/show/671128
OBS-URL: https://build.opensuse.org/package/show/security/xca?expand=0&rev=12

xca-configure.patch

@@ -1,8 +1,8 @@
-Index: configure.ac
+Index: xca-2.1.2/configure.ac
 ===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -228,7 +228,7 @@ if test "${enable_doc}"; then
+--- xca-2.1.2.orig/configure.ac
++++ xca-2.1.2/configure.ac
+@@ -226,7 +226,7 @@ if test "${enable_doc}"; then
  
    case "$DOCTOOL" in
     linuxdoc) DOCTOOL="linuxdoc -B html -H \$(TOPDIR)/doc/html.header";;
@@ -11,11 +11,11 @@ Index: configure.ac
     :)
      if test "${srcdir}" != "."; then
        mkdir -p doc
-Index: configure
+Index: xca-2.1.2/configure
 ===================================================================
---- configure.orig
-+++ configure
-@@ -4057,7 +4057,7 @@ test -n "$DOCTOOL" || DOCTOOL="":""
+--- xca-2.1.2.orig/configure
++++ xca-2.1.2/configure
+@@ -4136,7 +4136,7 @@ test -n "$DOCTOOL" || DOCTOOL="":""
  
    case "$DOCTOOL" in
     linuxdoc) DOCTOOL="linuxdoc -B html -H \$(TOPDIR)/doc/html.header";;

xca-desktop.patch

@@ -1,7 +1,7 @@
-Index: misc/xca.desktop
+Index: xca-2.1.2/misc/xca.desktop
 ===================================================================
---- misc/xca.desktop.orig
-+++ misc/xca.desktop
+--- xca-2.1.2.orig/misc/xca.desktop
++++ xca-2.1.2/misc/xca.desktop
 @@ -10,5 +10,5 @@ Comment[hr]=Grafičko korisničko sučel
  Exec=xca %F
  Icon=xca-32x32

xca.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb  4 14:02:49 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
+
+- Cleanup spec file
+- Use Qt5
+- Refresh patches
+
 -------------------------------------------------------------------
 Tue Jan 22 14:26:00 UTC 2019 - liedke@rz.uni-mannheim.de
 

xca.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xca
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,39 +12,36 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           xca
-Summary:        An RSA key and certificate management tool
-Summary(de):    Ein RSA-Schlüssel- und -Zertifikat-Managementprogramm
 Version:        2.1.2
 Release:        0
+Summary:        An RSA key and certificate management tool
+Summary(de):    Ein RSA-Schlüssel- und -Zertifikat-Managementprogramm
 License:        BSD-3-Clause
 Group:          Productivity/Networking/Security
-Url:            http://sourceforge.net/projects/xca/
+URL:            http://sourceforge.net/projects/xca/
 Source:         https://github.com/chris2511/xca/releases/download/RELEASE.%{version}/%{name}-%{version}.tar.gz
-Autoreqprov:    on
 Patch0:         %{name}-desktop.patch
-Patch100:       %{name}-configure.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  gcc-c++ >= 3.1.0
-#
+Patch1:         %{name}-configure.patch
+BuildRequires:  gcc-c++
+BuildRequires:  libqt5-linguist
+BuildRequires:  pkgconfig
+BuildRequires:  sgmltool
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Sql)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(openssl)
+Requires:       libQt5Sql5-sqlite
 %if 0%{?suse_version}
 BuildRequires:  libtool
 BuildRequires:  update-desktop-files
 %else
 BuildRequires:  libtool-ltdl-devel
 %endif
-#
-BuildRequires:  libqt4-devel >= 4.7.0
-BuildRequires:  openssl-devel >= 0.9.8
-BuildRequires:  sgmltool
-#
-Requires:       libqt4 >= 4.7.0
-Requires:       openssl >= 0.9.8
-Requires:       db
 
 %description
 Graphical certification authority is an interface for managing RSA
@@ -66,21 +63,20 @@ Auswahl von X509v3-Erweiterungen. Die Zertifikate werden in einer
 Baumstruktur präsentiert.
 
 %prep
-%setup
-%patch0
-%patch100
+%setup -q
+%autopatch -p1
 
 %build
-#bootstrap
-%configure --docdir=%{_datadir}/%{name}
-make destdir="%{buildroot}" prefix=%{_prefix} %{?_smp_mflags}
+%configure --with-qt-version=5 \
+           --docdir=%{_datadir}/%{name}
+
+%make_build destdir="%{buildroot}" prefix=%{_prefix}
 
 %install
-%make_install destdir="%{buildroot}" prefix="%{_prefix}"
+%make_install destdir="%{buildroot}" prefix=%{_prefix}
 %suse_update_desktop_file -i %{name} DesktopUtility
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS changelog VERSION
 %license COPYRIGHT
 %{_bindir}/%{name}
@@ -88,6 +84,6 @@ make destdir="%{buildroot}" prefix=%{_prefix} %{?_smp_mflags}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/pixmaps/%{name}*
 %{_datadir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}.1%{?ext_man}
 
 %changelog