Hello community, here is the log from the commit of package libmarblewidget for openSUSE:Factory checked in at 2016-07-21 07:51:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmarblewidget (Old) and /work/SRC/openSUSE:Factory/.libmarblewidget.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmarblewidget" Changes: -------- --- /work/SRC/openSUSE:Factory/libmarblewidget/libmarblewidget.changes 2016-01-25 10:22:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmarblewidget.new/libmarblewidget.changes 2016-07-21 07:51:33.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Jul 19 17:45:27 UTC 2016 - [email protected] + +- Drop libastro and build against the external one from + marble-devel instead of the one included here, to prevent + conflicts with the latest marble versions. +- Remove drop_soversion_coinstallability.diff, not needed any more + +------------------------------------------------------------------- +Sun Jul 17 03:15:10 UTC 2016 - [email protected] + +- Drop so version for libastro to maintain co-installability with + the KF5 based version. + * patch drop_soversion_coinstallability.diff + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmarblewidget.spec ++++++ --- /var/tmp/diff_new_pack.DZ889r/_old 2016-07-21 07:51:34.000000000 +0200 +++ /var/tmp/diff_new_pack.DZ889r/_new 2016-07-21 07:51:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libmarblewidget # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _so 22 Name: libmarblewidget @@ -27,8 +28,9 @@ Source0: marble-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel -BuildRequires: perl +BuildRequires: marble-devel BuildRequires: libkde4-devel +BuildRequires: perl BuildRequires: quazip-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,7 +41,6 @@ Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE Requires: libmarblewidget%{_so} = %{version} -Requires: libastro1 = %{version} Conflicts: marble-devel %description devel @@ -52,15 +53,10 @@ %description -n libmarblewidget%{_so} The shared library for the MarbleWidget shared library. -%package -n libastro1 -Summary: Astronomy: Shared Library -Group: Development/Libraries/KDE - -%description -n libastro1 -The Astronomy shared library for the MarbleWidget shared library. - %prep %setup -q -n marble-%{version} +# use the systemwide libastro includes +sed -i "s|\${CMAKE_SOURCE_DIR}/src/lib/astro|%{_includedir}/astro|" src/lib/marble/CMakeLists.txt %build %ifarch ppc ppc64 @@ -70,17 +66,11 @@ pushd src/lib/marble make popd -pushd src/lib/astro -make - %install pushd build/src/lib/marble %kde4_makeinstall popd - pushd build/src/lib/astro - %kde4_makeinstall - popd mkdir -p %{buildroot}%{_kde4_appsdir}/cmake/modules cp build/FindMarble.cmake %{buildroot}%{_kde4_appsdir}/cmake/modules/ %fdupes -s %{buildroot} @@ -89,18 +79,11 @@ %postun -n libmarblewidget%{_so} -p /sbin/ldconfig - -%post -n libastro1 -p /sbin/ldconfig - -%postun -n libastro1 -p /sbin/ldconfig - %files devel %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ -%{_includedir}/astro/ %{_libdir}/libmarblewidget.so -%{_libdir}/libastro.so %{_kde4_appsdir}/cmake/modules/FindMarble.cmake %files -n libmarblewidget%{_so} @@ -108,10 +91,4 @@ %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt %{_libdir}/libmarblewidget.so.* -%files -n libastro1 -%defattr(-,root,root) -%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt -%{_libdir}/libastro.so.* - - %changelog
