Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2015-10-03 20:27:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marble" Changes: -------- New Changes file: --- /dev/null 2015-09-24 09:51:01.260026505 +0200 +++ /work/SRC/openSUSE:Factory/.marble.new/libmarblewidget.changes 2015-10-03 20:28:57.000000000 +0200 @@ -0,0 +1,14 @@ +------------------------------------------------------------------- +Sun Sep 13 19:43:47 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + +- Drop upstream patch marble_fix_ppc64_build.patch +------------------------------------------------------------------- +Sun Aug 30 18:20:17 UTC 2015 - [email protected] + +- Initial package to fullfil the buildrequirements for libkgeomap + as it is still based on Qt4 + --- /work/SRC/openSUSE:Factory/marble/marble.changes 2015-07-14 17:39:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2015-10-03 20:28:58.000000000 +0200 @@ -1,0 +2,40 @@ +Sun Sep 13 19:43:47 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + +- Drop upstream patch marble_fix_ppc64_build.patch +------------------------------------------------------------------- +Sat Aug 29 18:27:03 UTC 2015 - [email protected] + +- Switch back to Qt4 build for Marble so that other dependencies + can be build too + +------------------------------------------------------------------- +Wed Aug 19 19:44:22 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.0 + * KDE Applications 15.08.0 + * https://www.kde.org/announcements/announce-applications-15.08.0.php + +------------------------------------------------------------------- +Wed Aug 19 11:09:31 UTC 2015 - [email protected] + +- Add marble_fix_ppc64_build.patch. Fixes the ppc64 installation paths +- Move FindMarble.cmake to marble-devel +- Spec cleanup + +------------------------------------------------------------------- +Fri Aug 7 07:04:33 UTC 2015 - [email protected] + +- Update to KDE Applications 15.07.90 + * KDE Applications 15.08.0 RC1 + * https://www.kde.org/announcements/announce-applications-15.07.90.php + * Marble is now Qt5/KF5 based + +- Drop patch do_not_build_qtonly_and_mobile.diff which is no + longer required + + +------------------------------------------------------------------- Old: ---- do_not_build_qtonly_and_mobile.diff marble-15.04.3.tar.xz New: ---- libmarblewidget.changes libmarblewidget.spec marble-15.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmarblewidget.spec ++++++ # # spec file for package libmarblewidget # # Copyright (c) 2015 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # %define _so 22 Name: libmarblewidget Version: 15.08.1 Release: 0 Summary: Generic map viewer library for libkgeomapr License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: marble-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: perl BuildRequires: libkde4-devel BuildRequires: quazip-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The shared library for the MarbleWidget shared library. %package devel Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE Requires: libmarblewidget%{_so} = %{version} Conflicts: marble-devel %description devel Development headers and libraries for Marble. %package -n libmarblewidget%{_so} Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE %description -n libmarblewidget%{_so} The shared library for the MarbleWidget shared library. %prep %setup -q -n marble-%{version} %build %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif %cmake_kde4 -d build -- -DQT5BUILD=OFF cd src/lib/marble make %install pushd build/src/lib/marble %kde4_makeinstall popd mkdir -p %{buildroot}%{_kde4_appsdir}/cmake/modules cp build/FindMarble.cmake %{buildroot}%{_kde4_appsdir}/cmake/modules/ %fdupes -s %{buildroot} %post -n libmarblewidget%{_so} -p /sbin/ldconfig %postun -n libmarblewidget%{_so} -p /sbin/ldconfig %files devel %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ %{_libdir}/libmarblewidget.so %{_kde4_appsdir}/cmake/modules/FindMarble.cmake %files -n libmarblewidget%{_so} %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt %{_libdir}/libmarblewidget.so.* %changelog ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.gbgCuB/_old 2015-10-03 20:28:59.000000000 +0200 +++ /var/tmp/diff_new_pack.gbgCuB/_new 2015-10-03 20:28:59.000000000 +0200 @@ -15,43 +15,83 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define _so 21 +%define _so -22 Name: marble -Version: 15.04.3 +Version: 15.08.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE do_not_build_qtonly_and_mobile.diff do not build qt-only version and mobile version -Patch0: do_not_build_qtonly_and_mobile.diff BuildRequires: fdupes BuildRequires: gpsd-devel -BuildRequires: libkde4-devel BuildRequires: perl -BuildRequires: quazip-devel -BuildRequires: xz +BuildRequires: kconfig-devel +BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Script) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 +BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0 +BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0 +BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 +BuildRequires: pkgconfig(Qt5SerialPort) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Designer) >= 5.2.0 +BuildRequires: kf5-filesystem +BuildRequires: extra-cmake-modules +BuildRequires: kwallet-devel +BuildRequires: knewstuff-devel +BuildRequires: kparts-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: phonon4qt5-devel +BuildRequires: kservice-devel +BuildRequires: krunner-devel +BuildRequires: libquazip-qt5-devel +Requires: libmarblewidget-qt5%{_so} = %{version} Requires: %{name}-data = %{version} Requires: libastro1 = %{version} -Requires: libmarblewidget%{_so} = %{version} +Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} -Provides: kde4-marble = 4.3.0 -Obsoletes: kde4-marble < 4.3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Marble is a viewer of map data. +%package qt +Summary: Qt Frontend for Marble +Group: Amusements/Teaching/Other +Requires: %{name} = %{version} +Provides: marble-frontend = %{version} +Conflicts: otherproviders(marble-frontend) + +%description qt +The Qt frontend for the Marble map viewer + +%package kde +Summary: The KDE optimized frontend for Marble +Group: Amusements/Teaching/Other +Requires: %{name} = %{version} +Provides: marble-frontend = %{version} +Conflicts: otherproviders(marble-frontend) +Supplements: packageand(marble:plasma5-desktop) + +%description kde +The KDE frontend for the Marble map viewer + %package data Summary: Generic map viewer: data Group: Amusements/Teaching/Other Requires: %{name} = %{version} -Provides: kde4-marble-data = 4.3.0 -Obsoletes: kde4-marble-data < 4.3.0 BuildArch: noarch %description data @@ -60,9 +100,8 @@ %package devel Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE -Requires: libmarblewidget%{_so} = %{version} -Provides: kde4-marble-devel = 4.3.0 -Obsoletes: kde4-marble-devel < 4.3.0 +Requires: libmarblewidget-qt5%{_so} = %{version} +Requires: libastro1 = %{version} %description devel Development headers and libraries for Marble. @@ -76,11 +115,11 @@ %description doc Marble is a viewer of map data. This package contains its documentation. -%package -n libmarblewidget%{_so} +%package -n libmarblewidget-qt5%{_so} Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE -%description -n libmarblewidget%{_so} +%description -n libmarblewidget-qt5%{_so} The shared library for the MarbleWidget shared library. %package -n libastro1 @@ -92,26 +131,44 @@ %prep %setup -q -%patch0 %build %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif - %cmake_kde4 -d build - %make_jobs + +export SUSE_ASNEEDED=0 +mkdir build +pushd build +cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ + -DCMAKE_INSTALL_PREFIX=%{_kf5_prefix} \ + -DCMAKE_PREFIX_PATH=%{_kf5_prefix} \ + -DKDE_INSTALL_LIBDIR=%{_lib} \ + -DKDE_INSTALL_SYSCONFDIR=%{_kf5_sysconfdir} \ + -DKDE_INSTALL_QTPLUGINDIR=%{_lib}/qt5/plugins \ + -DKDE_INSTALL_PLUGINDIR=%{_lib}/qt5/plugins \ + -DKDE_INSTALL_QMLDIR=%{_lib}/qt5/qml \ + -DKDE_INSTALL_QTQUICKIMPORTSDIR=%{_lib}/qt5/imports \ + -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \ + -DBUILD_TESTING=OFF \ + -DBUILD_MARBLE_TESTS=NO \ + -DWITH_KF5=TRUE \ + .. +%make_jobs %install - %kde4_makeinstall -C build - %kde_post_install + %kf5_makeinstall -C build + %fdupes -s %{buildroot} + rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop + rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop + rm -rf %{buildroot}/designer + rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile + rm -rf %{buildroot}%{_kf5_bindir}/marble-touch %fdupes -s %{buildroot} -#remove additional desktop files as they cause multiple non distinguishable entries in the homerun (https://bugs.kde.org/show_bug.cgi?id=327405#c8) or even a single random entry in kickoff - rm -rf %{buildroot}/usr/share/applications/kde4/marble-touch.desktop - -%post -n libmarblewidget%{_so} -p /sbin/ldconfig +%post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig -%postun -n libmarblewidget%{_so} -p /sbin/ldconfig +%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig %post -n libastro1 -p /sbin/ldconfig @@ -120,58 +177,59 @@ %files %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt -%dir %{_kde4_datadir}/appdata -%dir %{_kde4_libdir}/qt4/plugins/imports/org -%dir %{_kde4_libdir}/qt4/plugins/imports/org/kde/ -%dir %{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/ -%exclude %{_kde4_appsdir}/marble/data -%{_kde4_applicationsdir}/marble.desktop -%{_kde4_applicationsdir}/marble_gpx.desktop -%{_kde4_applicationsdir}/marble_kml.desktop -%{_kde4_applicationsdir}/marble_osm.desktop -%{_kde4_applicationsdir}/marble_kmz.desktop -%{_kde4_applicationsdir}/marble_geo.desktop -%{_kde4_applicationsdir}/marble_worldwind.desktop -%{_kde4_appsdir}/marble/ -%{_kde4_bindir}/marble* -#{_kde4_bindir}/routing-instructions -#{_kde4_bindir}/tilecreator -%{_kde4_configkcfgdir}/marble.kcfg -%{_kde4_datadir}/appdata/marble.appdata.xml -%{_kde4_datadir}/mime/packages/geo.xml -%{_kde4_iconsdir}/hicolor/*/apps/marble.* -%{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/marble/ -%{_kde4_modulesdir}/libmarble_part.so -%{_kde4_modulesdir}/marblethumbnail.so -%{_kde4_modulesdir}/plasma_applet_worldclock.so -%{_kde4_modulesdir}/plasma_runner_marble.so -%{_kde4_modulesdir}/plugins/designer/* -%{_kde4_modulesdir}/plugins/marble/ -%{_kde4_servicesdir}/*.desktop +%dir %{_kf5_libdir}/plugins/ +%exclude %{_kf5_sharedir}/marble/data +%exclude %{_kf5_sharedir}/marble/cmake +%{_kf5_applicationsdir}/marble_geo.desktop +%{_kf5_applicationsdir}/marble_gpx.desktop +%{_kf5_applicationsdir}/marble_kml.desktop +%{_kf5_applicationsdir}/marble_kmz.desktop +%{_kf5_applicationsdir}/marble_osm.desktop +%{_kf5_applicationsdir}/marble_worldwind.desktop +%{_kf5_configkcfgdir}/ +%{_kf5_iconsdir}/hicolor/*/apps/marble.* +%{_kf5_kxmlguidir}/marble/ +%{_kf5_libdir}/marble/ +%{_kf5_libdir}/plugins/designer/ +%{_kf5_plugindir}/libmarble*so +%{_kf5_plugindir}/plasma_runner_marble.so +%{_kf5_servicesdir}/*desktop +%{_kf5_sharedir}/appdata/ +%{_kf5_sharedir}/marble/ %files devel %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ %{_includedir}/astro/ -%{_kde4_libdir}/libmarblewidget.so -%{_kde4_libdir}/libastro.so -%{_kde4_appsdir}/cmake/modules/FindMarble.cmake +%{_kf5_libdir}/libmarblewidget-qt5.so +%{_kf5_libdir}/libastro.so +%{_kf5_sharedir}/marble/cmake/ %files data %defattr(-,root,root) -%{_kde4_appsdir}/marble/data +%{_kf5_sharedir}/marble/data %files doc %defattr(-,root,root) -%{_kde4_htmldir}/en/marble/ +%{_kf5_htmldir}/en/marble/ -%files -n libmarblewidget%{_so} +%files -n libmarblewidget-qt5%{_so} %defattr(-,root,root) -%{_kde4_libdir}/libmarblewidget.so.* +%{_kf5_libdir}/libmarblewidget-qt5.so.* %files -n libastro1 %defattr(-,root,root) -%{_kde4_libdir}/libastro.so.* +%{_kf5_libdir}/libastro.so.* + +%files qt +%defattr(-,root,root) +%{_kf5_applicationsdir}/marble-qt.desktop +%{_kf5_bindir}/marble-qt + +%files kde +%defattr(-,root,root) +%{_kf5_applicationsdir}/marble.desktop +%{_kf5_bindir}/marble %changelog ++++++ marble-15.04.3.tar.xz -> marble-15.08.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/marble/marble-15.04.3.tar.xz /work/SRC/openSUSE:Factory/.marble.new/marble-15.08.1.tar.xz differ: char 26, line 1
