diff --git a/marble.spec b/marble.spec index 73df97c..a8bdbf5 100644 --- a/marble.spec +++ b/marble.spec @@ -1,6 +1,6 @@ Name: marble Version: 20.08.1 -Release: 1mamba +Release: 2mamba Summary: A free open source geographical map program Group: Graphical Desktop/Applications/Educational Vendor: openmamba @@ -13,8 +13,10 @@ Patch1: marble-15.12.2-gcc-5.3.0-std_isnan.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libQt5ExtSerialPort-devel -BuildRequires: libQt5WebKit-devel +BuildRequires: ldconfig +%ifnarch arm +BuildRequires: libQt5WebEngine-devel +%endif BuildRequires: libattica5-devel BuildRequires: libgcc BuildRequires: libgps-devel @@ -35,8 +37,9 @@ BuildRequires: libkrunner-devel BuildRequires: libkservice-devel BuildRequires: libktextwidgets-devel BuildRequires: libkwidgetsaddons-devel +BuildRequires: libkwindowsystem-devel BuildRequires: libkxmlgui-devel -BuildRequires: libphonon-qt5-devel +BuildRequires: libphonon-devel BuildRequires: libplasma-framework-devel BuildRequires: libqt5-devel BuildRequires: libsonnet-devel @@ -48,6 +51,7 @@ BuildRequires: libgps-devel >= 3.21-1mamba BuildRequires: cmake Provides: marble5 Obsoletes: marble5 +Obsoletes: marble4 Requires: libmarble = %{?epoch:%epoch:}%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -72,9 +76,10 @@ Choose between a Flat Map ("Plate carré"), Mercator or the Globe. %package -n libmarble Group: Graphical Desktop/Libraries/KDE -Summary: KDE5 library files for %{name} +Summary: Library files for %{name} Provides: libmarble5 Obsoletes: libmarble5 +Obsoletes: libmarble4 %description -n libmarble This package contains shared libraries for %{name}. @@ -85,6 +90,7 @@ Summary: Marble development files Requires: libmarble = %{?epoch:%epoch:}%{version}-%{release} Provides: libmarble5-devel Obsoletes: libmarble5-devel +Obsoletes: libmarble4-devel %description -n libmarble-devel This package contains libraries and header files for developing applications that use %{name}. @@ -203,6 +209,9 @@ exit 0 %doc docs/* %changelog +* Wed Sep 09 2020 Silvan Calarco 20.08.1-2mamba +- obsolete libmarble4 + * Fri Sep 04 2020 Automatic Build System 20.08.1-1mamba - automatic version update by autodist