From 9316d14eb7f636e0e85ac4ae6140bbff7477665da01096c8ed5b1cca20490c81 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 25 Mar 2019 08:59:56 +0000 Subject: [PATCH] Accepting request 688137 from home:cgiboudeaux:branches:KDE:Extra - Drop the KDE4/Qt4 package. OBS-URL: https://build.opensuse.org/request/show/688137 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/alkimia?expand=0&rev=10 --- alkimia.changes | 5 +++ alkimia.spec | 81 +++++++++++-------------------------------------- 2 files changed, 23 insertions(+), 63 deletions(-) diff --git a/alkimia.changes b/alkimia.changes index 6e47090..98e0d3f 100644 --- a/alkimia.changes +++ b/alkimia.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 25 07:22:02 UTC 2019 - Christophe Giboudeaux + +- Drop the KDE4/Qt4 package. + ------------------------------------------------------------------- Thu Oct 25 09:14:40 UTC 2018 - Christophe Giboudeaux diff --git a/alkimia.spec b/alkimia.spec index b064884..72ccece 100644 --- a/alkimia.spec +++ b/alkimia.spec @@ -1,7 +1,7 @@ # # spec file for package alkimia # -# Copyright (c) 2018 SUSE LINUX 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 @@ -16,8 +16,6 @@ # -%define soname_qt4 libalkimia -%define soname_qt5 libalkimia5 %define sonum 7 Name: alkimia Version: 7.0.2 @@ -30,87 +28,44 @@ Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{ver BuildRequires: doxygen BuildRequires: extra-cmake-modules BuildRequires: gmp-devel -BuildRequires: libkde4-devel -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 +BuildRequires: cmake(Qt5Core) >= 5.2.0 +BuildRequires: cmake(Qt5DBus) >= 5.2.0 +BuildRequires: cmake(Qt5Test) >= 5.2.0 %description libalkimia is a library with common classes and functionality used by finance applications. -%package -n %{soname_qt4}%{sonum} +%package -n libalkimia5-%{sonum} Summary: Library with common classes and functionality used by finance applications Group: System/Libraries -%description -n %{soname_qt4}%{sonum} -%{soname_qt4} is a library for Qt4 with common classes and functionality used by finance +%description -n libalkimia5-%{sonum} +libalkimia is a library for Qt5 with common classes and functionality used by finance applications. -%package -n %{soname_qt5}-%{sonum} -Summary: Library with common classes and functionality used by finance applications -Group: System/Libraries - -%description -n %{soname_qt5}-%{sonum} -%{soname_qt5} is a library for Qt5 with common classes and functionality used by finance -applications. - -%package -n %{soname_qt4}-devel -Summary: Development Files for %{soname_qt4} +%package -n libalkimia5-devel +Summary: Development Files for libalkimia Group: Development/Languages/C and C++ -Requires: %{soname_qt4}%{sonum} = %{version} +Requires: libalkimia5-%{sonum} = %{version} -%description -n %{soname_qt4}-devel -The development files for %{soname_qt4}. - -%package -n %{soname_qt5}-devel -Summary: Development Files for %{soname_qt5} -Group: Development/Languages/C and C++ -Requires: %{soname_qt5}-%{sonum} = %{version} - -%description -n %{soname_qt5}-devel -The development files for %{soname_qt5}. +%description -n libalkimia5-devel +The development files for libalkimia. %prep %setup -q %build -WORKDIR="$PWD" - -%cmake_kf5 -d build-qt5 -%make_jobs - -cd "$WORKDIR" -%cmake_kde4 -d build-qt4 -- -DBUILD_QT4=1 +%cmake_kf5 -d build %make_jobs %install -%kf5_makeinstall -C build-qt5 +%kf5_makeinstall -C build -cd build-qt4 -%kde4_makeinstall -cd .. +%post -n libalkimia5-%{sonum} -p /sbin/ldconfig +%postun -n libalkimia5-%{sonum} -p /sbin/ldconfig -%post -n %{soname_qt4}%{sonum} -p /sbin/ldconfig -%postun -n %{soname_qt4}%{sonum} -p /sbin/ldconfig -%post -n %{soname_qt5}-%{sonum} -p /sbin/ldconfig -%postun -n %{soname_qt5}-%{sonum} -p /sbin/ldconfig - -%files -n %{soname_qt4}-devel -%license COPYING.LIB -%dir %{_kde4_includedir}/alkimia/ -%{_kde4_includedir}/alkimia/Qt4 -%{_kde4_libdir}/cmake/LibAlkimia-*/ -%{_kde4_libdir}/libalkimia.so -%{_libdir}/pkgconfig/libalkimia.pc - -%files -n %{soname_qt4}%{sonum} -%license COPYING.LIB -%doc README.md -%{_kde4_libdir}/libalkimia.so.%{sonum}* - -%files -n %{soname_qt5}-devel +%files -n libalkimia5-devel %license COPYING.LIB %dir %{_includedir}/alkimia/ %{_includedir}/alkimia/Qt5 @@ -118,7 +73,7 @@ cd .. %{_kf5_libdir}/libalkimia5.so %{_libdir}/pkgconfig/libalkimia5.pc -%files -n %{soname_qt5}-%{sonum} +%files -n libalkimia5-%{sonum} %license COPYING.LIB %doc README.md %{_kf5_libdir}/libalkimia5.so.%{sonum}*