From 8a70df11a566e7ff70627bfd3734a803bb5548c39b08b13cdd2db5d9f9035550 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 11 Oct 2015 14:36:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=60 --- marble.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/marble.spec b/marble.spec index 2ead64f..d41f28c 100644 --- a/marble.spec +++ b/marble.spec @@ -27,6 +27,8 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE fix-libastro-version-tagging.diff alarrosa@suse.com -- Declare QT_NO_VERSION_TAGGING Patch0: fix-libastro-version-tagging.diff +# PATCH-FIX-OPENSUSE make_astro_coinstall.diff tittiatcoke@gmail.com -- Make astro coinstallable with its Qt4 version +Patch1: make_astro_coinstall.diff BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: perl @@ -61,7 +63,7 @@ BuildRequires: krunner-devel BuildRequires: libquazip-qt5-devel Requires: libmarblewidget-qt5%{_so} = %{version} Requires: %{name}-data = %{version} -Requires: libastro1 = %{version} +Requires: libastro-qt5-1 = %{version} Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,7 +105,7 @@ Marble is a viewer of map data. This package contains its data. Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE Requires: libmarblewidget-qt5%{_so} = %{version} -Requires: libastro1 = %{version} +Requires: libastro-qt5-1 = %{version} %description devel Development headers and libraries for Marble. @@ -124,16 +126,17 @@ Group: Development/Libraries/KDE %description -n libmarblewidget-qt5%{_so} The shared library for the MarbleWidget shared library. -%package -n libastro1 +%package -n libastro-qt5-1 Summary: Astronomy: Shared Library Group: Development/Libraries/KDE -%description -n libastro1 +%description -n libastro-qt5-1 The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %ifarch ppc ppc64 @@ -173,9 +176,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig -%post -n libastro1 -p /sbin/ldconfig +%post -n libastro-qt5-1 -p /sbin/ldconfig -%postun -n libastro1 -p /sbin/ldconfig +%postun -n libastro-qt5-1 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -206,7 +209,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_includedir}/marble/ %{_includedir}/astro/ %{_kf5_libdir}/libmarblewidget-qt5.so -%{_kf5_libdir}/libastro.so +%{_kf5_libdir}/libastro-qt5.so %{_kf5_sharedir}/marble/cmake/ %files data @@ -221,9 +224,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %defattr(-,root,root) %{_kf5_libdir}/libmarblewidget-qt5.so.* -%files -n libastro1 +%files -n libastro-qt5-1 %defattr(-,root,root) -%{_kf5_libdir}/libastro.so.* +%{_kf5_libdir}/libastro-qt5.so.* %files qt %defattr(-,root,root)