From a073b25fad9ce751fc7a781cb0e080348977ee6b6b030efecea3237e476c1fcd Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 07:04:46 +0000 Subject: [PATCH 01/40] update to (15.07.90) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=17 --- marble-15.04.3.tar.xz | 3 --- marble-15.07.90.tar.xz | 3 +++ marble.changes | 8 ++++++++ marble.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 marble-15.04.3.tar.xz create mode 100644 marble-15.07.90.tar.xz diff --git a/marble-15.04.3.tar.xz b/marble-15.04.3.tar.xz deleted file mode 100644 index d55ee9b..0000000 --- a/marble-15.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5aa065a8271df5f2ef594d8a8cc2985223b1f009a06f1ad569e17ee4b2724bba -size 23054680 diff --git a/marble-15.07.90.tar.xz b/marble-15.07.90.tar.xz new file mode 100644 index 0000000..5873b3e --- /dev/null +++ b/marble-15.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bff40fc4b73297fdf1d8c2c87db573830a7104f2da2be7f7742fd8b10b0acb8 +size 23274876 diff --git a/marble.changes b/marble.changes index 02ee3e5..2f73547 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 7 07:04:33 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.07.90 + * KDE Applications 15.08.0 RC1 + * https://www.kde.org/announcements/announce-applications-15.07.90.php + + ------------------------------------------------------------------- Mon Jul 6 05:33:45 UTC 2015 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index c2755e2..55b2099 100644 --- a/marble.spec +++ b/marble.spec @@ -19,7 +19,7 @@ %define _so 21 Name: marble -Version: 15.04.3 +Version: 15.07.90 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From 5aa2b843acf4dc9df50f4d2b05c388e6a9908c7516d3b3ed6cef96f1655f31e1 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 09:50:12 +0000 Subject: [PATCH 02/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=18 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index 55b2099..2e480a3 100644 --- a/marble.spec +++ b/marble.spec @@ -92,7 +92,7 @@ The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q -%patch0 +#patch0 %build %ifarch ppc ppc64 From aab704aeeb8459f55f49852ae1148be95d6fd7ae27cdca275bb7e0c651d3c75d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 10:58:08 +0000 Subject: [PATCH 03/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=19 --- do_not_build_qtonly_and_mobile.diff | 11 -- marble.changes | 4 + marble.spec | 197 ++++++++++++++++++---------- 3 files changed, 132 insertions(+), 80 deletions(-) delete mode 100644 do_not_build_qtonly_and_mobile.diff diff --git a/do_not_build_qtonly_and_mobile.diff b/do_not_build_qtonly_and_mobile.diff deleted file mode 100644 index d65473d..0000000 --- a/do_not_build_qtonly_and_mobile.diff +++ /dev/null @@ -1,11 +0,0 @@ -Index: src/apps/CMakeLists.txt -=================================================================== ---- src/apps/CMakeLists.txt.orig 2014-03-31 09:51:15.000000000 +0200 -+++ src/apps/CMakeLists.txt 2014-04-25 22:22:29.253322142 +0200 -@@ -1,6 +1,4 @@ - add_subdirectory(marble-ui) --add_subdirectory(marble-qt) --add_subdirectory(marble-mobile) - - if (NOT QTONLY) - add_subdirectory(marble-kde) diff --git a/marble.changes b/marble.changes index 2f73547..eea041c 100644 --- a/marble.changes +++ b/marble.changes @@ -5,6 +5,10 @@ Fri Aug 7 07:04:33 UTC 2015 - tittiatcoke@gmail.com * KDE Applications 15.08.0 RC1 * https://www.kde.org/announcements/announce-applications-15.07.90.php +- Switch to Qt5 build +- Drop patch do_not_build_qtonly_and_mobile.diff which is no + longer required + ------------------------------------------------------------------- Mon Jul 6 05:33:45 UTC 2015 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 2e480a3..6ae5784 100644 --- a/marble.spec +++ b/marble.spec @@ -16,7 +16,7 @@ # -%define _so 21 +%define _so 22 Name: marble Version: 15.07.90 @@ -26,32 +26,73 @@ 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: 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: perl -BuildRequires: quazip-devel -BuildRequires: xz +BuildRequires: libquazip-qt5-devel Requires: %{name}-data = %{version} -Requires: libastro1 = %{version} -Requires: libmarblewidget%{_so} = %{version} +Requires: libastro2 = %{version} +Requires: libmarblewidget-qt5%{_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 +101,7 @@ Marble is a viewer of map data. This package contains its data. %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} %description devel Development headers and libraries for Marble. @@ -76,102 +115,122 @@ BuildArch: noarch %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 +%package -n libastro2 Summary: Astronomy: Shared Library Group: Development/Libraries/KDE -%description -n libastro1 +%description -n libastro2 The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q -#patch0 %build +export SUSE_ASNEEDED=0 %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif - %cmake_kde4 -d build - %make_jobs +mkdir build +cd 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 \ +%ifarch x86_64 + -DLIB_SUFFIX=64 \ +%endif + -DWITH_KF5=TRUE \ + .. +%make_jobs %install - %kde4_makeinstall -C build - %kde_post_install + %kf5_makeinstall -C build %fdupes -s %{buildroot} + rm -rf %{buildroot}/designer + rm -rf %{buildroot}%{_bindir}/marble-mobile + rm -rf %{buildroot}%{_bindir}/marble-touch + rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop + rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop -#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-qt5%{_so} -p /sbin/ldconfig -%post -n libmarblewidget%{_so} -p /sbin/ldconfig +%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig -%postun -n libmarblewidget%{_so} -p /sbin/ldconfig +%post -n libastro2 -p /sbin/ldconfig -%post -n libastro1 -p /sbin/ldconfig - -%postun -n libastro1 -p /sbin/ldconfig +%postun -n libastro2 -p /sbin/ldconfig %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 +%{_datadir}/marble/ +%{_datadir}/appdata/ +%{_kf5_iconsdir}/hicolor/*/apps/marble.* +%{_libdir}/marble/ +%{_libdir}/libmarbledeclarative.so +%dir %{_libdir}/plugins/ +%{_libdir}/plugins/designer/ +%exclude %{_datadir}/marble/data +%_kf5_plugindir/libmarble*so +%_kf5_plugindir/libplasma_runner_marble.so +%_kf5_servicesdir/*desktop +%_kf5_kxmlguidir/marble/ +%_kf5_configkcfgdir/ +%_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_bindir/marble-maps %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 %files data %defattr(-,root,root) -%{_kde4_appsdir}/marble/data +%{_datadir}/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 +%files -n libastro2 %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 From fa2a7d78a22c3ade8835fd6e8938063095d85934e4b6c70d1f278a38cbf6a3b4 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 11:27:27 +0000 Subject: [PATCH 04/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=20 --- marble.spec | 108 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 93 insertions(+), 15 deletions(-) diff --git a/marble.spec b/marble.spec index 6ae5784..64b5be0 100644 --- a/marble.spec +++ b/marble.spec @@ -15,8 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define with_qt5 0 +%if 0{?with_qt5} +%define _so -qt522 +%else %define _so 22 +%endif Name: marble Version: 15.07.90 @@ -28,6 +33,7 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel +%if 0{?with_qt5} BuildRequires: kconfig-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 @@ -58,9 +64,14 @@ BuildRequires: kservice-devel BuildRequires: krunner-devel BuildRequires: perl BuildRequires: libquazip-qt5-devel +%else +BuildRequires: libkde4-devel +BuildRequires: perl +BuildRequires: quazip-devel +%endif Requires: %{name}-data = %{version} Requires: libastro2 = %{version} -Requires: libmarblewidget-qt5%{_so} = %{version} +Requires: libmarblewidget%{_so} = %{version} Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -84,7 +95,11 @@ Group: Amusements/Teaching/Other Requires: %{name} = %{version} Provides: marble-frontend = %{version} Conflicts: otherproviders(marble-frontend) +%if 0{?with_qt5} Supplements: packageand(marble:plasma5-desktop) +%else +Supplements: packageand(marble:kdebase4-workspace) +%endif %description kde The KDE frontend for the Marble map viewer @@ -101,7 +116,7 @@ Marble is a viewer of map data. This package contains its data. %package devel Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE -Requires: libmarblewidget-qt5%{_so} = %{version} +Requires: libmarblewidget%{_so} = %{version} %description devel Development headers and libraries for Marble. @@ -115,11 +130,11 @@ BuildArch: noarch %description doc Marble is a viewer of map data. This package contains its documentation. -%package -n libmarblewidget-qt5%{_so} +%package -n libmarblewidget%{_so} Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE -%description -n libmarblewidget-qt5%{_so} +%description -n libmarblewidget%{_so} The shared library for the MarbleWidget shared library. %package -n libastro2 @@ -133,6 +148,11 @@ The Astronomy shared library for the MarbleWidget shared library. %setup -q %build +%ifarch ppc ppc64 +export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%endif + +%if 0{?with_qt5} export SUSE_ASNEEDED=0 %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" @@ -156,36 +176,49 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %endif -DWITH_KF5=TRUE \ .. +%else + %cmake_kde4 -d build +%endif + %make_jobs %install +%if 0{?with_qt5} %kf5_makeinstall -C build %fdupes -s %{buildroot} + rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop + rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop +%else + %kde4_makeinstall -C build + rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-mobile.desktop + rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-touch.desktop + %kde_post_install + %fdupes -s %{buildroot} +%endif rm -rf %{buildroot}/designer rm -rf %{buildroot}%{_bindir}/marble-mobile rm -rf %{buildroot}%{_bindir}/marble-touch - rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop - rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop -%post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig +%post -n libmarblewidget%{_so} -p /sbin/ldconfig -%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig +%postun -n libmarblewidget%{_so} -p /sbin/ldconfig %post -n libastro2 -p /sbin/ldconfig -%postun -n libastro2 -p /sbin/ldconfig +n libastro2 -p /sbin/ldconfig %files %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt %{_datadir}/marble/ %{_datadir}/appdata/ -%{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_libdir}/marble/ %{_libdir}/libmarbledeclarative.so %dir %{_libdir}/plugins/ %{_libdir}/plugins/designer/ %exclude %{_datadir}/marble/data +%if 0{?with_qt5} +%{_kf5_iconsdir}/hicolor/*/apps/marble.* %_kf5_plugindir/libmarble*so %_kf5_plugindir/libplasma_runner_marble.so %_kf5_servicesdir/*desktop @@ -197,15 +230,44 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %_kf5_applicationsdir/marble_kmz.desktop %_kf5_applicationsdir/marble_osm.desktop %_kf5_applicationsdir/marble_worldwind.desktop -%_kf5_bindir/marble-maps +%else +%{_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_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 +%{_kde4_appsdir}/marble/ +%endif +%_bindir/marble-maps %files devel %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ %{_includedir}/astro/ +%if 0{?with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so %{_kf5_libdir}/libastro.so +%else +%{_kde4_libdir}/libmarblewidget.so +%{_kde4_libdir}/libastro.so +%{_kde4_appsdir}/cmake/modules/FindMarble.cmake +%endif + %files data %defattr(-,root,root) @@ -213,11 +275,19 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files doc %defattr(-,root,root) -%_kf5_htmldir/en/marble/ +%if 0{?with_qt5} +%{_kf5_htmldir}/en/marble/ +%else +%{_kde4_htmldir}/en/marble/ +%endif -%files -n libmarblewidget-qt5%{_so} +%files -n libmarblewidget%{_so} %defattr(-,root,root) +%if 0{?with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so.* +%else +%{_kde4_libdir}/libmarblewidget.so.* +%endif %files -n libastro2 %defattr(-,root,root) @@ -225,12 +295,20 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files qt %defattr(-,root,root) +%if 0{?with_qt5} %{_kf5_applicationsdir}/marble-qt.desktop -%{_kf5_bindir}/marble-qt +%else +%{_kde4_applicationsdir}/marble-qt.desktop +%endif +%{_bindir}/marble-qt %files kde %defattr(-,root,root) +%if 0{?with_qt5} %{_kf5_applicationsdir}/marble.desktop -%{_kf5_bindir}/marble +%else +%{_kde4_applicationsdir}/marble.desktop +%endif +%{_bindir}/marble %changelog From 408feef97171179138f988c94d19143cf0b8b430b22ef5419d412d077d4e74b7 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 11:28:33 +0000 Subject: [PATCH 05/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=21 --- marble.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/marble.spec b/marble.spec index 64b5be0..b16c0b0 100644 --- a/marble.spec +++ b/marble.spec @@ -213,7 +213,6 @@ n libastro2 -p /sbin/ldconfig %{_datadir}/marble/ %{_datadir}/appdata/ %{_libdir}/marble/ -%{_libdir}/libmarbledeclarative.so %dir %{_libdir}/plugins/ %{_libdir}/plugins/designer/ %exclude %{_datadir}/marble/data @@ -252,7 +251,6 @@ n libastro2 -p /sbin/ldconfig %{_kde4_servicesdir}/*.desktop %{_kde4_appsdir}/marble/ %endif -%_bindir/marble-maps %files devel %defattr(-,root,root) From 0f40778ff64c84432e774d1938f9627bf6e3c8b2089fc1aa5767e8da366259ff Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 11:39:08 +0000 Subject: [PATCH 06/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=22 --- marble.spec | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/marble.spec b/marble.spec index b16c0b0..37b1576 100644 --- a/marble.spec +++ b/marble.spec @@ -17,7 +17,7 @@ %define with_qt5 0 -%if 0{?with_qt5} +%if %{with_qt5} %define _so -qt522 %else %define _so 22 @@ -33,7 +33,7 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel -%if 0{?with_qt5} +%if %{with_qt5} BuildRequires: kconfig-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 @@ -95,7 +95,7 @@ Group: Amusements/Teaching/Other Requires: %{name} = %{version} Provides: marble-frontend = %{version} Conflicts: otherproviders(marble-frontend) -%if 0{?with_qt5} +%if %{with_qt5} Supplements: packageand(marble:plasma5-desktop) %else Supplements: packageand(marble:kdebase4-workspace) @@ -152,11 +152,8 @@ The Astronomy shared library for the MarbleWidget shared library. export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%if 0{?with_qt5} +%if %{with_qt5} export SUSE_ASNEEDED=0 -%ifarch ppc ppc64 -export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" -%endif mkdir build cd build cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ @@ -183,7 +180,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %make_jobs %install -%if 0{?with_qt5} +%if %{with_qt5} %kf5_makeinstall -C build %fdupes -s %{buildroot} rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop @@ -205,7 +202,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %post -n libastro2 -p /sbin/ldconfig -n libastro2 -p /sbin/ldconfig +%postun -n libastro2 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -216,7 +213,7 @@ n libastro2 -p /sbin/ldconfig %dir %{_libdir}/plugins/ %{_libdir}/plugins/designer/ %exclude %{_datadir}/marble/data -%if 0{?with_qt5} +%if %{with_qt5} %{_kf5_iconsdir}/hicolor/*/apps/marble.* %_kf5_plugindir/libmarble*so %_kf5_plugindir/libplasma_runner_marble.so @@ -257,7 +254,7 @@ n libastro2 -p /sbin/ldconfig %doc BUGS CODING %{_includedir}/marble/ %{_includedir}/astro/ -%if 0{?with_qt5} +%if %{with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so %{_kf5_libdir}/libastro.so %else @@ -273,7 +270,7 @@ n libastro2 -p /sbin/ldconfig %files doc %defattr(-,root,root) -%if 0{?with_qt5} +%if %{with_qt5} %{_kf5_htmldir}/en/marble/ %else %{_kde4_htmldir}/en/marble/ @@ -281,7 +278,7 @@ n libastro2 -p /sbin/ldconfig %files -n libmarblewidget%{_so} %defattr(-,root,root) -%if 0{?with_qt5} +%if %{with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so.* %else %{_kde4_libdir}/libmarblewidget.so.* @@ -293,7 +290,7 @@ n libastro2 -p /sbin/ldconfig %files qt %defattr(-,root,root) -%if 0{?with_qt5} +%if %{with_qt5} %{_kf5_applicationsdir}/marble-qt.desktop %else %{_kde4_applicationsdir}/marble-qt.desktop @@ -302,7 +299,7 @@ n libastro2 -p /sbin/ldconfig %files kde %defattr(-,root,root) -%if 0{?with_qt5} +%if %{with_qt5} %{_kf5_applicationsdir}/marble.desktop %else %{_kde4_applicationsdir}/marble.desktop From 770f1688f0bbb7f5a2244dd241f5866d1a575736a94f0766248db04834994b76 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 12:05:26 +0000 Subject: [PATCH 07/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=23 --- marble.spec | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/marble.spec b/marble.spec index 37b1576..b543ed5 100644 --- a/marble.spec +++ b/marble.spec @@ -210,10 +210,10 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_datadir}/marble/ %{_datadir}/appdata/ %{_libdir}/marble/ -%dir %{_libdir}/plugins/ -%{_libdir}/plugins/designer/ %exclude %{_datadir}/marble/data %if %{with_qt5} +%dir %{_libdir}/plugins/ +%{_libdir}/plugins/designer/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* %_kf5_plugindir/libmarble*so %_kf5_plugindir/libplasma_runner_marble.so @@ -227,26 +227,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %_kf5_applicationsdir/marble_osm.desktop %_kf5_applicationsdir/marble_worldwind.desktop %else -%{_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_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 -%{_kde4_appsdir}/marble/ %endif %files devel From f8910971e2ec970dd589db1bb76a9f45ef1515895e05da7c357eb69f444bd66a Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 12:42:38 +0000 Subject: [PATCH 08/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=24 --- marble.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/marble.spec b/marble.spec index b543ed5..11ace1e 100644 --- a/marble.spec +++ b/marble.spec @@ -276,7 +276,6 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %if %{with_qt5} %{_kf5_applicationsdir}/marble-qt.desktop %else -%{_kde4_applicationsdir}/marble-qt.desktop %endif %{_bindir}/marble-qt From 617f8e6435fede87853c31dd91b4df7e9238ae8fad90271223f3f46765b1b51d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 12:52:54 +0000 Subject: [PATCH 09/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=25 --- marble.changes | 2 +- marble.spec | 69 +++++--------------------------------------------- 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/marble.changes b/marble.changes index eea041c..3c7cc25 100644 --- a/marble.changes +++ b/marble.changes @@ -4,8 +4,8 @@ Fri Aug 7 07:04:33 UTC 2015 - tittiatcoke@gmail.com - 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 -- Switch to Qt5 build - Drop patch do_not_build_qtonly_and_mobile.diff which is no longer required diff --git a/marble.spec b/marble.spec index 11ace1e..1d08d98 100644 --- a/marble.spec +++ b/marble.spec @@ -15,13 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define with_qt5 0 - -%if %{with_qt5} -%define _so -qt522 -%else %define _so 22 -%endif Name: marble Version: 15.07.90 @@ -33,7 +27,6 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel -%if %{with_qt5} BuildRequires: kconfig-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 @@ -64,14 +57,9 @@ BuildRequires: kservice-devel BuildRequires: krunner-devel BuildRequires: perl BuildRequires: libquazip-qt5-devel -%else -BuildRequires: libkde4-devel -BuildRequires: perl -BuildRequires: quazip-devel -%endif Requires: %{name}-data = %{version} Requires: libastro2 = %{version} -Requires: libmarblewidget%{_so} = %{version} +Requires: libmarblewidget-qt5%{_so} = %{version} Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,11 +83,7 @@ Group: Amusements/Teaching/Other Requires: %{name} = %{version} Provides: marble-frontend = %{version} Conflicts: otherproviders(marble-frontend) -%if %{with_qt5} Supplements: packageand(marble:plasma5-desktop) -%else -Supplements: packageand(marble:kdebase4-workspace) -%endif %description kde The KDE frontend for the Marble map viewer @@ -116,7 +100,7 @@ Marble is a viewer of map data. This package contains its data. %package devel Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE -Requires: libmarblewidget%{_so} = %{version} +Requires: libmarblewidget-qt5%{_so} = %{version} %description devel Development headers and libraries for Marble. @@ -130,11 +114,11 @@ BuildArch: noarch %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 libastro2 @@ -152,7 +136,6 @@ The Astronomy shared library for the MarbleWidget shared library. export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%if %{with_qt5} export SUSE_ASNEEDED=0 mkdir build cd build @@ -173,32 +156,21 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %endif -DWITH_KF5=TRUE \ .. -%else - %cmake_kde4 -d build -%endif %make_jobs %install -%if %{with_qt5} %kf5_makeinstall -C build %fdupes -s %{buildroot} rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop -%else - %kde4_makeinstall -C build - rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-mobile.desktop - rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-touch.desktop - %kde_post_install - %fdupes -s %{buildroot} -%endif rm -rf %{buildroot}/designer rm -rf %{buildroot}%{_bindir}/marble-mobile rm -rf %{buildroot}%{_bindir}/marble-touch -%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 libastro2 -p /sbin/ldconfig @@ -211,7 +183,6 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_datadir}/appdata/ %{_libdir}/marble/ %exclude %{_datadir}/marble/data -%if %{with_qt5} %dir %{_libdir}/plugins/ %{_libdir}/plugins/designer/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* @@ -226,25 +197,14 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %_kf5_applicationsdir/marble_kmz.desktop %_kf5_applicationsdir/marble_osm.desktop %_kf5_applicationsdir/marble_worldwind.desktop -%else -%{_kde4_datadir}/appdata/marble.appdata.xml -%{_kde4_iconsdir}/hicolor/*/apps/marble.* -%{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/marble/ -%endif %files devel %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ %{_includedir}/astro/ -%if %{with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so %{_kf5_libdir}/libastro.so -%else -%{_kde4_libdir}/libmarblewidget.so -%{_kde4_libdir}/libastro.so -%{_kde4_appsdir}/cmake/modules/FindMarble.cmake -%endif %files data @@ -253,19 +213,11 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files doc %defattr(-,root,root) -%if %{with_qt5} %{_kf5_htmldir}/en/marble/ -%else -%{_kde4_htmldir}/en/marble/ -%endif -%files -n libmarblewidget%{_so} +%files -n libmarblewidget-qt5%{_so} %defattr(-,root,root) -%if %{with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so.* -%else -%{_kde4_libdir}/libmarblewidget.so.* -%endif %files -n libastro2 %defattr(-,root,root) @@ -273,19 +225,12 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files qt %defattr(-,root,root) -%if %{with_qt5} %{_kf5_applicationsdir}/marble-qt.desktop -%else -%endif %{_bindir}/marble-qt %files kde %defattr(-,root,root) -%if %{with_qt5} %{_kf5_applicationsdir}/marble.desktop -%else -%{_kde4_applicationsdir}/marble.desktop -%endif %{_bindir}/marble %changelog From 00709d346578321a169c10a7851abf81211109e1317035c154ad8c6fe49a2709 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 13:14:11 +0000 Subject: [PATCH 10/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=26 --- marble.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/marble.spec b/marble.spec index 1d08d98..2442379 100644 --- a/marble.spec +++ b/marble.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _so 22 +%define _so -22 Name: marble Version: 15.07.90 @@ -58,7 +58,7 @@ BuildRequires: krunner-devel BuildRequires: perl BuildRequires: libquazip-qt5-devel Requires: %{name}-data = %{version} -Requires: libastro2 = %{version} +Requires: libastro1 = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} @@ -121,11 +121,11 @@ Group: Development/Libraries/KDE %description -n libmarblewidget-qt5%{_so} The shared library for the MarbleWidget shared library. -%package -n libastro2 +%package -n libastro1 Summary: Astronomy: Shared Library Group: Development/Libraries/KDE -%description -n libastro2 +%description -n libastro1 The Astronomy shared library for the MarbleWidget shared library. %prep @@ -172,9 +172,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig -%post -n libastro2 -p /sbin/ldconfig +%post -n libastro1 -p /sbin/ldconfig -%postun -n libastro2 -p /sbin/ldconfig +%postun -n libastro1 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -219,7 +219,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %defattr(-,root,root) %{_kf5_libdir}/libmarblewidget-qt5.so.* -%files -n libastro2 +%files -n libastro1 %defattr(-,root,root) %{_kf5_libdir}/libastro.so.* From b2bb0de488321b562076dd882ac65570fdc4b7fc5aec9f482e36f37739cda67f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 19 Aug 2015 11:13:00 +0000 Subject: [PATCH 11/40] Add marble_fix_ppc64_build.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=27 --- marble.changes | 5 +++ marble.spec | 2 ++ marble_fix_ppc64_build.patch | 63 ++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 marble_fix_ppc64_build.patch diff --git a/marble.changes b/marble.changes index 3c7cc25..0d82ca0 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 19 11:09:31 UTC 2015 - cgiboudeaux@gmx.com + +- Add marble_fix_ppc64_build.patch. Fixes the ppc64 installation paths + ------------------------------------------------------------------- Fri Aug 7 07:04:33 UTC 2015 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 2442379..88c7170 100644 --- a/marble.spec +++ b/marble.spec @@ -24,6 +24,8 @@ Summary: Generic map viewer License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org +# PATCH-FIX-UPSTREAM marble_fix_ppc64_build.patch -- Don't expect LIB_SUFFIX to be set +Patch0: marble_fix_ppc64_build.patch Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel diff --git a/marble_fix_ppc64_build.patch b/marble_fix_ppc64_build.patch new file mode 100644 index 0000000..0e973c2 --- /dev/null +++ b/marble_fix_ppc64_build.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6278e93..7aec313 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,10 @@ SET(CMAKE_COLOR_MAKEFILE ON) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + ++# Let CMake find the correct library dir instead of ++# relying on the obsolete LIB_SUFFIX parameter ++include(GNUInstallDirs) ++ + # Taken from KDECompilerSettings.cmake: + # Pick sensible versions of the C and C++ standards. + # Note that MSVC does not have equivalent flags; the features are either +@@ -193,11 +197,9 @@ set (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?") + set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer") + add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO") + +-# TODO: this could use GNUInstallDirs or ECM, so e.g. LIB_SUFFIX is automatically set +-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) + set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) + if (QT5BUILD) +- set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/plugins) ++ set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) + endif() + + #################################################### +@@ -223,7 +225,7 @@ elseif(APPLE) + SET (plugin_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/plugins) + else() # Linux / bsd etc... + set(data_dir ${CMAKE_INSTALL_PREFIX}/share/marble/data) +- set(plugin_dir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/marble/plugins) ++ set(plugin_dir ${CMAKE_INSTALL_LIBDIR}/marble/plugins) + set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/marble/cmake) + endif() + +diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt +index 677eb7d..dda65a7 100644 +--- a/src/lib/astro/CMakeLists.txt ++++ b/src/lib/astro/CMakeLists.txt +@@ -48,7 +48,7 @@ if(WIN32) + elseif(APPLE) + INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) + else() +- INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) ++ INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + + ########### install files ############### +diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt +index 26eda3e..42857ed 100644 +--- a/src/lib/marble/CMakeLists.txt ++++ b/src/lib/marble/CMakeLists.txt +@@ -438,7 +438,7 @@ if(WIN32) + elseif(APPLE) + install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) + else() +- install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) ++ install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + + From 27221e03ed2eb028d507405769274712ef1554075d3a4d97449df4285159efd3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 19 Aug 2015 11:58:13 +0000 Subject: [PATCH 12/40] - OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=28 --- marble.changes | 2 ++ marble.spec | 50 ++++++++++++++++++++++++-------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/marble.changes b/marble.changes index 0d82ca0..8e80112 100644 --- a/marble.changes +++ b/marble.changes @@ -2,6 +2,8 @@ Wed Aug 19 11:09:31 UTC 2015 - cgiboudeaux@gmx.com - 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 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 88c7170..80563d1 100644 --- a/marble.spec +++ b/marble.spec @@ -153,9 +153,6 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \ -DBUILD_TESTING=OFF \ -DBUILD_MARBLE_TESTS=NO \ -%ifarch x86_64 - -DLIB_SUFFIX=64 \ -%endif -DWITH_KF5=TRUE \ .. @@ -167,8 +164,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop rm -rf %{buildroot}/designer - rm -rf %{buildroot}%{_bindir}/marble-mobile - rm -rf %{buildroot}%{_bindir}/marble-touch + rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile + rm -rf %{buildroot}%{_kf5_bindir}/marble-touch %post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig @@ -181,24 +178,25 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt -%{_datadir}/marble/ -%{_datadir}/appdata/ -%{_libdir}/marble/ -%exclude %{_datadir}/marble/data -%dir %{_libdir}/plugins/ -%{_libdir}/plugins/designer/ +%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_plugindir/libmarble*so -%_kf5_plugindir/libplasma_runner_marble.so -%_kf5_servicesdir/*desktop -%_kf5_kxmlguidir/marble/ -%_kf5_configkcfgdir/ -%_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_kxmlguidir}/marble/ +%{_kf5_libdir}/marble/ +%{_kf5_libdir}/plugins/designer/ +%{_kf5_plugindir}/libmarble*so +%{_kf5_plugindir}/libplasma_runner_marble.so +%{_kf5_servicesdir}/*desktop +%{_kf5_sharedir}/appdata/ +%{_kf5_sharedir}/marble/ %files devel %defattr(-,root,root) @@ -207,11 +205,11 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_includedir}/astro/ %{_kf5_libdir}/libmarblewidget-qt5.so %{_kf5_libdir}/libastro.so - +%{_kf5_sharedir}/marble/cmake/ %files data %defattr(-,root,root) -%{_datadir}/marble/data +%{_kf5_sharedir}/marble/data %files doc %defattr(-,root,root) @@ -228,11 +226,11 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files qt %defattr(-,root,root) %{_kf5_applicationsdir}/marble-qt.desktop -%{_bindir}/marble-qt +%{_kf5_bindir}/marble-qt %files kde %defattr(-,root,root) %{_kf5_applicationsdir}/marble.desktop -%{_bindir}/marble +%{_kf5_bindir}/marble %changelog From db126f6fce68711232889a600af809f1fac9b24ee552b5a1c6163878eacce005 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 19 Aug 2015 14:58:04 +0000 Subject: [PATCH 13/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=29 --- marble.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/marble.spec b/marble.spec index 80563d1..b57cbe8 100644 --- a/marble.spec +++ b/marble.spec @@ -132,6 +132,7 @@ The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q +%patch0 -p1 %build %ifarch ppc ppc64 From ac899165ac9041dd333a35ff02a7b554ac487a2540f4906ade2d1b0e366a56c1 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 19 Aug 2015 19:48:24 +0000 Subject: [PATCH 14/40] 15.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=30 --- marble-15.07.90.tar.xz | 3 --- marble-15.08.0.tar.xz | 3 +++ marble.changes | 7 +++++++ marble.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 marble-15.07.90.tar.xz create mode 100644 marble-15.08.0.tar.xz diff --git a/marble-15.07.90.tar.xz b/marble-15.07.90.tar.xz deleted file mode 100644 index 5873b3e..0000000 --- a/marble-15.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bff40fc4b73297fdf1d8c2c87db573830a7104f2da2be7f7742fd8b10b0acb8 -size 23274876 diff --git a/marble-15.08.0.tar.xz b/marble-15.08.0.tar.xz new file mode 100644 index 0000000..8fa327d --- /dev/null +++ b/marble-15.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3db6f9c8eb27c2add498797cb676e446b9fd1f470bac94b1353b4a3062ea4ba7 +size 23273400 diff --git a/marble.changes b/marble.changes index 8e80112..58b9b76 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 19 19:44:22 UTC 2015 - cgiboudeaux@gmx.com + +- 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 - cgiboudeaux@gmx.com diff --git a/marble.spec b/marble.spec index b57cbe8..f5593a3 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -22 Name: marble -Version: 15.07.90 +Version: 15.08.0 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From f83d74c2944a8fbe8ffc7d97eb25395b0de56e5501c07c411c664bab264dcc7a Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 29 Aug 2015 18:25:31 +0000 Subject: [PATCH 15/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=31 --- marble.spec | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 2 deletions(-) diff --git a/marble.spec b/marble.spec index f5593a3..69c8ca5 100644 --- a/marble.spec +++ b/marble.spec @@ -17,6 +17,8 @@ %define _so -22 +%define withqt5 0 + Name: marble Version: 15.08.0 Release: 0 @@ -29,6 +31,8 @@ Patch0: marble_fix_ppc64_build.patch Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel +BuildRequires: perl +%if 0%{?withqt5} BuildRequires: kconfig-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 @@ -57,11 +61,15 @@ BuildRequires: ki18n-devel BuildRequires: phonon4qt5-devel BuildRequires: kservice-devel BuildRequires: krunner-devel -BuildRequires: perl BuildRequires: libquazip-qt5-devel +Requires: libmarblewidget-qt5%{_so} = %{version} +%else +BuildRequires: libkde4-devel +BuildRequires: quazip-devel +Requires: libmarblewidget-qt4%{_so} = %{version} +%endif Requires: %{name}-data = %{version} Requires: libastro1 = %{version} -Requires: libmarblewidget-qt5%{_so} = %{version} Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -116,11 +124,19 @@ BuildArch: noarch %description doc Marble is a viewer of map data. This package contains its documentation. +%if 0%{?withqt5} %package -n libmarblewidget-qt5%{_so} +%else +%package -n libmarblewidget%{_so} +%endif Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE +%if 0%{?withqt5} %description -n libmarblewidget-qt5%{_so} +%else +%description -n libmarblewidget%{_so} +%endif The shared library for the MarbleWidget shared library. %package -n libastro1 @@ -139,6 +155,7 @@ The Astronomy shared library for the MarbleWidget shared library. export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif +%if 0%{?withqt5} export SUSE_ASNEEDED=0 mkdir build cd build @@ -156,10 +173,14 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ -DBUILD_MARBLE_TESTS=NO \ -DWITH_KF5=TRUE \ .. +%else + %cmake_kde4 -d build -- -DQT5BUILD=OFF +%endif %make_jobs %install +%if 0%{?withqt5} %kf5_makeinstall -C build %fdupes -s %{buildroot} rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop @@ -167,15 +188,32 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ rm -rf %{buildroot}/designer rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile rm -rf %{buildroot}%{_kf5_bindir}/marble-touch +%else + %kde4_makeinstall -C build + %kde_post_install + %fdupes -s %{buildroot} + rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-mobile.desktop + rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-touch.desktop + rm -rf %{buildroot}/designer + rm -rf %{buildroot}%{_bindir}/marble-mobile + rm -rf %{buildroot}%{_bindir}/marble-touch +%endif +%if 0%{?withqt5} %post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig +%else +%post -n libmarblewidget%{_so} -p /sbin/ldconfig + +%postun -n libmarblewidget%{_so} -p /sbin/ldconfig +%endif %post -n libastro1 -p /sbin/ldconfig %postun -n libastro1 -p /sbin/ldconfig +%if 0%{?withqt5} %files %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt @@ -233,5 +271,68 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %defattr(-,root,root) %{_kf5_applicationsdir}/marble.desktop %{_kf5_bindir}/marble +%else +%files +%defattr(-,root,root) +%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt +%dir %{_libdir}/plugins/ +%exclude %{_datadir}/marble/data +%exclude %{_datadir}/marble/cmake +%{_kde4_applicationsdir}/marble_geo.desktop +%{_kde4_applicationsdir}/marble_gpx.desktop +%{_kde4_applicationsdir}/marble_kml.desktop +%{_kde4_applicationsdir}/marble_kmz.desktop +%{_kde4_applicationsdir}/marble_osm.desktop +%{_kde4_applicationsdir}/marble_worldwind.desktop +%{_kde4_configkcfgdir}/ +%{_kde4_iconsdir}/hicolor/*/apps/marble.* +%{_kde4_kxmlguidir}/marble/ +%{_libdir}/marble/ +%{_libdir}/plugins/designer/ +%{_kde4_plugindir}/libmarble*so +%{_kde4_plugindir}/libplasma_runner_marble.so +%{_kde4_servicesdir}/*desktop +%{_datadir}/appdata/ +%{_datadir}/marble/ + +%files devel +%defattr(-,root,root) +%doc BUGS CODING +%{_includedir}/marble/ +%{_includedir}/astro/ +%{_libdir}/libmarblewidget.so +%{_libdir}/libastro.so +%{_datadir}/marble/cmake/ + +%files data +%defattr(-,root,root) +%{_datadir}/marble/data + +%files doc +%defattr(-,root,root) +%{_kde4_htmldir}/en/marble/ + +%files -n libmarblewidget%{_so} +%defattr(-,root,root) +%{_libdir}/libmarblewidget.so.* + +%files -n libastro1 +%defattr(-,root,root) +%{_libdir}/libastro.so.* + +%files qt +%defattr(-,root,root) +%{_kde4_applicationsdir}/marble-qt.desktop +%{__bindir}/marble-qt + +%files kde +%defattr(-,root,root) +%{_kde4_applicationsdir}/marble.desktop +%{_bindir}/marble +%endif + + +%changelog + %changelog From 013b002a05e6494d75210c451d83fbe40302e137cb8f942900180908602ca25d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 29 Aug 2015 18:27:39 +0000 Subject: [PATCH 16/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=32 --- marble.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/marble.changes b/marble.changes index 58b9b76..769cd66 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 29 18:27:03 UTC 2015 - tittiatcoke@gmail.com + +- Switch back to Qt4 build for Marble so that other dependencies + can be build too + ------------------------------------------------------------------- Wed Aug 19 19:44:22 UTC 2015 - cgiboudeaux@gmx.com From 5fa32c3c8717979c103287c4f810aa960c727731cd93a49039040053cfb0012e Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 29 Aug 2015 19:05:21 +0000 Subject: [PATCH 17/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=33 --- marble.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/marble.spec b/marble.spec index 69c8ca5..7e8b2c6 100644 --- a/marble.spec +++ b/marble.spec @@ -278,20 +278,16 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %dir %{_libdir}/plugins/ %exclude %{_datadir}/marble/data %exclude %{_datadir}/marble/cmake -%{_kde4_applicationsdir}/marble_geo.desktop -%{_kde4_applicationsdir}/marble_gpx.desktop -%{_kde4_applicationsdir}/marble_kml.desktop -%{_kde4_applicationsdir}/marble_kmz.desktop -%{_kde4_applicationsdir}/marble_osm.desktop -%{_kde4_applicationsdir}/marble_worldwind.desktop +%{_datadir}applications/marble_geo.desktop +%{_datadir}/applications/marble_gpx.desktop +%{_datadir}/applications//marble_kml.desktop +%{_datadir}/applications/marble_kmz.desktop +%{_datadir}/applications/marble_osm.desktop +%{_datadir}/applications/marble_worldwind.desktop %{_kde4_configkcfgdir}/ %{_kde4_iconsdir}/hicolor/*/apps/marble.* -%{_kde4_kxmlguidir}/marble/ %{_libdir}/marble/ -%{_libdir}/plugins/designer/ -%{_kde4_plugindir}/libmarble*so -%{_kde4_plugindir}/libplasma_runner_marble.so -%{_kde4_servicesdir}/*desktop +%{_libdir}/qt4/plugins/ %{_datadir}/appdata/ %{_datadir}/marble/ @@ -322,7 +318,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files qt %defattr(-,root,root) -%{_kde4_applicationsdir}/marble-qt.desktop +%{_datadir}/applications/marble-qt.desktop %{__bindir}/marble-qt %files kde From f7894ac7ee97aff17706a6cb84bce0f02ebf7d1dfd2672632e2c41001d51beb4 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 29 Aug 2015 19:24:57 +0000 Subject: [PATCH 18/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=34 --- marble.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/marble.spec b/marble.spec index 7e8b2c6..a3f3dfc 100644 --- a/marble.spec +++ b/marble.spec @@ -275,16 +275,14 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt -%dir %{_libdir}/plugins/ %exclude %{_datadir}/marble/data %exclude %{_datadir}/marble/cmake -%{_datadir}applications/marble_geo.desktop +%{_datadir}/applications/marble_geo.desktop %{_datadir}/applications/marble_gpx.desktop %{_datadir}/applications//marble_kml.desktop %{_datadir}/applications/marble_kmz.desktop %{_datadir}/applications/marble_osm.desktop -%{_datadir}/applications/marble_worldwind.desktop -%{_kde4_configkcfgdir}/ +#{_datadir}/applications/marble_worldwind.desktop %{_kde4_iconsdir}/hicolor/*/apps/marble.* %{_libdir}/marble/ %{_libdir}/qt4/plugins/ From a6e4d2139a1feccbd4cf84ee29e5506cc16fc09cd162f31dde72e5f6f10bad37 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 29 Aug 2015 19:41:54 +0000 Subject: [PATCH 19/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=35 --- marble.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marble.spec b/marble.spec index a3f3dfc..763a94c 100644 --- a/marble.spec +++ b/marble.spec @@ -220,12 +220,12 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %dir %{_kf5_libdir}/plugins/ %exclude %{_kf5_sharedir}/marble/data %exclude %{_kf5_sharedir}/marble/cmake -%{_kf5_applicationsdir}/marble_geo.desktop +#{_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_applicationsdir}/marble_worldwind.desktop %{_kf5_configkcfgdir}/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_kxmlguidir}/marble/ From 92b704644f4e89aea0c30fbadbf00080790d23b4357a40d4c87ee5a4c9271a64 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 29 Aug 2015 19:58:37 +0000 Subject: [PATCH 20/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=36 --- marble.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/marble.spec b/marble.spec index 763a94c..560f61a 100644 --- a/marble.spec +++ b/marble.spec @@ -192,8 +192,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %kde4_makeinstall -C build %kde_post_install %fdupes -s %{buildroot} - rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-mobile.desktop - rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-touch.desktop + rm -rf %{buildroot}%{_datadir}/applications/marble-mobile.desktop + rm -rf %{buildroot}%{_datadir}/applications/marble-touch.desktop rm -rf %{buildroot}/designer rm -rf %{buildroot}%{_bindir}/marble-mobile rm -rf %{buildroot}%{_bindir}/marble-touch @@ -220,12 +220,12 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %dir %{_kf5_libdir}/plugins/ %exclude %{_kf5_sharedir}/marble/data %exclude %{_kf5_sharedir}/marble/cmake -#{_kf5_applicationsdir}/marble_geo.desktop +%{_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_applicationsdir}/marble_worldwind.desktop %{_kf5_configkcfgdir}/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_kxmlguidir}/marble/ @@ -277,12 +277,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt %exclude %{_datadir}/marble/data %exclude %{_datadir}/marble/cmake -%{_datadir}/applications/marble_geo.desktop -%{_datadir}/applications/marble_gpx.desktop -%{_datadir}/applications//marble_kml.desktop -%{_datadir}/applications/marble_kmz.desktop -%{_datadir}/applications/marble_osm.desktop -#{_datadir}/applications/marble_worldwind.desktop +%{_datadir}/applications/*.desktop %{_kde4_iconsdir}/hicolor/*/apps/marble.* %{_libdir}/marble/ %{_libdir}/qt4/plugins/ From 7ea4fd788e56fa1c9eee069ec13921a42904938116cfd86b88ddedd8be5d6869 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 29 Aug 2015 20:14:47 +0000 Subject: [PATCH 21/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=37 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index 560f61a..a2e768c 100644 --- a/marble.spec +++ b/marble.spec @@ -312,7 +312,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files qt %defattr(-,root,root) %{_datadir}/applications/marble-qt.desktop -%{__bindir}/marble-qt +%{_bindir}/marble-qt %files kde %defattr(-,root,root) From 17ef981a9bc828c2c527026475268965c0aef63e4f8795e73e5d3950be390746 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 29 Aug 2015 20:15:25 +0000 Subject: [PATCH 22/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=38 --- marble.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/marble.spec b/marble.spec index a2e768c..22ce9e7 100644 --- a/marble.spec +++ b/marble.spec @@ -278,6 +278,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %exclude %{_datadir}/marble/data %exclude %{_datadir}/marble/cmake %{_datadir}/applications/*.desktop +%exclude %{_datadir}/applications/marble-qt.desktop +%exclude %{_datadir}/applications/marble.desktop %{_kde4_iconsdir}/hicolor/*/apps/marble.* %{_libdir}/marble/ %{_libdir}/qt4/plugins/ From 02db4c8730994fcdf0fc9f397a0c513501b10c18ddb1bc691b8d74f9fa77e52d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 30 Aug 2015 07:53:44 +0000 Subject: [PATCH 23/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=39 --- marble.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marble.spec b/marble.spec index 22ce9e7..ebf62c1 100644 --- a/marble.spec +++ b/marble.spec @@ -318,8 +318,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files kde %defattr(-,root,root) -%{_kde4_applicationsdir}/marble.desktop -%{_bindir}/marble +%{_datadir}/applications/marble.desktop +#{_bindir}/marble %endif From a358723f75891be035c2ac8d6e3e318159af7b87053cc77bf7f7fe6b71668825 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 30 Aug 2015 07:54:22 +0000 Subject: [PATCH 24/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=40 --- marble.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marble.spec b/marble.spec index ebf62c1..4b336b3 100644 --- a/marble.spec +++ b/marble.spec @@ -279,7 +279,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %exclude %{_datadir}/marble/cmake %{_datadir}/applications/*.desktop %exclude %{_datadir}/applications/marble-qt.desktop -%exclude %{_datadir}/applications/marble.desktop +#exclude %{_datadir}/applications/marble.desktop %{_kde4_iconsdir}/hicolor/*/apps/marble.* %{_libdir}/marble/ %{_libdir}/qt4/plugins/ @@ -318,7 +318,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files kde %defattr(-,root,root) -%{_datadir}/applications/marble.desktop +#{_datadir}/applications/marble.desktop #{_bindir}/marble %endif From f739933b837c2d1fc168d6f46db408b871c2cd2fd19cba707ed0812f12c26f48 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 30 Aug 2015 18:22:21 +0000 Subject: [PATCH 25/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=41 --- libmarblewidget.changes | 6 +++ libmarblewidget.spec | 89 ++++++++++++++++++++++++++++++++++++++ marble.spec | 95 +---------------------------------------- 3 files changed, 97 insertions(+), 93 deletions(-) create mode 100644 libmarblewidget.changes create mode 100644 libmarblewidget.spec diff --git a/libmarblewidget.changes b/libmarblewidget.changes new file mode 100644 index 0000000..15f1b81 --- /dev/null +++ b/libmarblewidget.changes @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Sun Aug 30 18:20:17 UTC 2015 - tittiatcoke@gmail.com + +- Initial package to fullfil the buildrequirements for libkgeomap + as it is still based on Qt4 + diff --git a/libmarblewidget.spec b/libmarblewidget.spec new file mode 100644 index 0000000..4bf1ca8 --- /dev/null +++ b/libmarblewidget.spec @@ -0,0 +1,89 @@ +# +# 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.0 +Release: 0 +Summary: Generic map viewer library for libkgeomapr +License: LGPL-2.1+ +Group: Amusements/Teaching/Other +Url: http://edu.kde.org +# PATCH-FIX-UPSTREAM marble_fix_ppc64_build.patch -- Don't expect LIB_SUFFIX to be set +Patch0: marble_fix_ppc64_build.patch +Source0: %{name}-%{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-qt5%{_so} = %{version} + +%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 +%patch0 -p1 + +%build +%ifarch ppc ppc64 +export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%endif +%cmake_kde4 -d qt4 -- -DQT5BUILD=OFF +cd qt4/src/lib/marble +make + +%install + pushd qt4/src/lib/marble + %kde4_makeinstall + popd + %fdupes -s %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files devel +%defattr(-,root,root) +%doc BUGS CODING +%{_includedir}/marble/ +%{_kf5_libdir}/libmarblewidget-qt5.so +%{_kf5_sharedir}/marble/cmake/ + +%files +%defattr(-,root,root) +%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt +%{_libdir}/libmarblewidget.so.* + +%changelog diff --git a/marble.spec b/marble.spec index 4b336b3..40a5099 100644 --- a/marble.spec +++ b/marble.spec @@ -17,8 +17,6 @@ %define _so -22 -%define withqt5 0 - Name: marble Version: 15.08.0 Release: 0 @@ -32,7 +30,6 @@ Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: perl -%if 0%{?withqt5} BuildRequires: kconfig-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 @@ -63,11 +60,6 @@ BuildRequires: kservice-devel BuildRequires: krunner-devel BuildRequires: libquazip-qt5-devel Requires: libmarblewidget-qt5%{_so} = %{version} -%else -BuildRequires: libkde4-devel -BuildRequires: quazip-devel -Requires: libmarblewidget-qt4%{_so} = %{version} -%endif Requires: %{name}-data = %{version} Requires: libastro1 = %{version} Requires: marble-frontend = %{version} @@ -111,6 +103,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} %description devel Development headers and libraries for Marble. @@ -124,19 +117,11 @@ BuildArch: noarch %description doc Marble is a viewer of map data. This package contains its documentation. -%if 0%{?withqt5} %package -n libmarblewidget-qt5%{_so} -%else -%package -n libmarblewidget%{_so} -%endif Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE -%if 0%{?withqt5} %description -n libmarblewidget-qt5%{_so} -%else -%description -n libmarblewidget%{_so} -%endif The shared library for the MarbleWidget shared library. %package -n libastro1 @@ -155,10 +140,9 @@ The Astronomy shared library for the MarbleWidget shared library. export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%if 0%{?withqt5} export SUSE_ASNEEDED=0 mkdir build -cd build +pushd build cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ -DCMAKE_INSTALL_PREFIX=%{_kf5_prefix} \ -DCMAKE_PREFIX_PATH=%{_kf5_prefix} \ @@ -173,14 +157,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ -DBUILD_MARBLE_TESTS=NO \ -DWITH_KF5=TRUE \ .. -%else - %cmake_kde4 -d build -- -DQT5BUILD=OFF -%endif - %make_jobs %install -%if 0%{?withqt5} %kf5_makeinstall -C build %fdupes -s %{buildroot} rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop @@ -188,32 +167,16 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ rm -rf %{buildroot}/designer rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile rm -rf %{buildroot}%{_kf5_bindir}/marble-touch -%else - %kde4_makeinstall -C build - %kde_post_install %fdupes -s %{buildroot} - rm -rf %{buildroot}%{_datadir}/applications/marble-mobile.desktop - rm -rf %{buildroot}%{_datadir}/applications/marble-touch.desktop - rm -rf %{buildroot}/designer - rm -rf %{buildroot}%{_bindir}/marble-mobile - rm -rf %{buildroot}%{_bindir}/marble-touch -%endif -%if 0%{?withqt5} %post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig -%else -%post -n libmarblewidget%{_so} -p /sbin/ldconfig - -%postun -n libmarblewidget%{_so} -p /sbin/ldconfig -%endif %post -n libastro1 -p /sbin/ldconfig %postun -n libastro1 -p /sbin/ldconfig -%if 0%{?withqt5} %files %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt @@ -271,59 +234,5 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %defattr(-,root,root) %{_kf5_applicationsdir}/marble.desktop %{_kf5_bindir}/marble -%else -%files -%defattr(-,root,root) -%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt -%exclude %{_datadir}/marble/data -%exclude %{_datadir}/marble/cmake -%{_datadir}/applications/*.desktop -%exclude %{_datadir}/applications/marble-qt.desktop -#exclude %{_datadir}/applications/marble.desktop -%{_kde4_iconsdir}/hicolor/*/apps/marble.* -%{_libdir}/marble/ -%{_libdir}/qt4/plugins/ -%{_datadir}/appdata/ -%{_datadir}/marble/ - -%files devel -%defattr(-,root,root) -%doc BUGS CODING -%{_includedir}/marble/ -%{_includedir}/astro/ -%{_libdir}/libmarblewidget.so -%{_libdir}/libastro.so -%{_datadir}/marble/cmake/ - -%files data -%defattr(-,root,root) -%{_datadir}/marble/data - -%files doc -%defattr(-,root,root) -%{_kde4_htmldir}/en/marble/ - -%files -n libmarblewidget%{_so} -%defattr(-,root,root) -%{_libdir}/libmarblewidget.so.* - -%files -n libastro1 -%defattr(-,root,root) -%{_libdir}/libastro.so.* - -%files qt -%defattr(-,root,root) -%{_datadir}/applications/marble-qt.desktop -%{_bindir}/marble-qt - -%files kde -%defattr(-,root,root) -#{_datadir}/applications/marble.desktop -#{_bindir}/marble -%endif - - -%changelog - %changelog From 8348f26c6b6058bbf0327592f36896ccf515bc47b3077c3bf7dfbcc8f0ba4623 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 30 Aug 2015 18:32:13 +0000 Subject: [PATCH 26/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=42 --- libmarblewidget.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmarblewidget.spec b/libmarblewidget.spec index 4bf1ca8..a00a714 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -26,7 +26,7 @@ Group: Amusements/Teaching/Other Url: http://edu.kde.org # PATCH-FIX-UPSTREAM marble_fix_ppc64_build.patch -- Don't expect LIB_SUFFIX to be set Patch0: marble_fix_ppc64_build.patch -Source0: %{name}-%{version}.tar.xz +Source0: marble-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: perl @@ -53,7 +53,7 @@ Group: Development/Libraries/KDE The shared library for the MarbleWidget shared library. %prep -%setup -q +%setup -q -n marble-%{version} %patch0 -p1 %build From f0784673014e16d31c44755c55e24cc442bd0cb379214312185910d500189f19 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 30 Aug 2015 18:40:00 +0000 Subject: [PATCH 27/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=43 --- libmarblewidget.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libmarblewidget.spec b/libmarblewidget.spec index a00a714..faa0e73 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -60,12 +60,12 @@ The shared library for the MarbleWidget shared library. %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%cmake_kde4 -d qt4 -- -DQT5BUILD=OFF -cd qt4/src/lib/marble +%cmake_kde4 -d build -- -DQT5BUILD=OFF +cd src/lib/marble make %install - pushd qt4/src/lib/marble + pushd build/src/lib/marble %kde4_makeinstall popd %fdupes -s %{buildroot} From ae51d5db5fc45b62ff06aaf8ec81105d8aed62eb0386467e2717c7d01daa6927 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 30 Aug 2015 19:12:20 +0000 Subject: [PATCH 28/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=44 --- libmarblewidget.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libmarblewidget.spec b/libmarblewidget.spec index faa0e73..a027d60 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -68,6 +68,8 @@ make 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 -p /sbin/ldconfig @@ -78,8 +80,8 @@ make %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ -%{_kf5_libdir}/libmarblewidget-qt5.so -%{_kf5_sharedir}/marble/cmake/ +%{_libdir}/libmarblewidget.so +%{_kde4_appsdir}/cmake/modules/FindMarble.cmake %files %defattr(-,root,root) From 64e84bf3655f4b9902dd3ccff822eedec16e0ad584113809ad217493ce22b56a Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 30 Aug 2015 19:35:30 +0000 Subject: [PATCH 29/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=45 --- libmarblewidget.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libmarblewidget.spec b/libmarblewidget.spec index a027d60..57bd390 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -40,7 +40,8 @@ The shared library for the MarbleWidget shared library. %package devel Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE -Requires: libmarblewidget-qt5%{_so} = %{version} +Requires: libmarblewidget%{_so} = %{version} +Conflicts: marble-devel %description devel Development headers and libraries for Marble. @@ -72,9 +73,9 @@ make cp build/FindMarble.cmake %{buildroot}%{_kde4_appsdir}/cmake/modules/ %fdupes -s %{buildroot} -%post -p /sbin/ldconfig +%post -n libmarblewidget%{_so} -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libmarblewidget%{_so} -p /sbin/ldconfig %files devel %defattr(-,root,root) @@ -83,7 +84,7 @@ make %{_libdir}/libmarblewidget.so %{_kde4_appsdir}/cmake/modules/FindMarble.cmake -%files +%files -n libmarblewidget%{_so} %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt %{_libdir}/libmarblewidget.so.* From 00929933f2239c6999def215c9a44cda791e0a0060afe4be648f0196c7d2b644 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 30 Aug 2015 20:12:12 +0000 Subject: [PATCH 30/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=46 --- libmarblewidget.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmarblewidget.spec b/libmarblewidget.spec index 57bd390..1654b09 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _so -22 +%define _so 22 Name: libmarblewidget Version: 15.08.0 From 9a67bbacaa558ec7e38795723574cf48b1013616c8ab03169c762196395d13cd Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:44:23 +0000 Subject: [PATCH 31/40] update to (15.08.1) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=47 --- marble-15.08.0.tar.xz | 3 --- marble-15.08.1.tar.xz | 3 +++ marble.changes | 8 ++++++++ marble.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 marble-15.08.0.tar.xz create mode 100644 marble-15.08.1.tar.xz diff --git a/marble-15.08.0.tar.xz b/marble-15.08.0.tar.xz deleted file mode 100644 index 8fa327d..0000000 --- a/marble-15.08.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3db6f9c8eb27c2add498797cb676e446b9fd1f470bac94b1353b4a3062ea4ba7 -size 23273400 diff --git a/marble-15.08.1.tar.xz b/marble-15.08.1.tar.xz new file mode 100644 index 0000000..4dd4c46 --- /dev/null +++ b/marble-15.08.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7248b2f1dcaac1f6819f2749654c10c44e790a578f03aeebaec33a2661c8a037 +size 23273312 diff --git a/marble.changes b/marble.changes index 769cd66..6605a24 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + + ------------------------------------------------------------------- Sat Aug 29 18:27:03 UTC 2015 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 40a5099..5406bdf 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -22 Name: marble -Version: 15.08.0 +Version: 15.08.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From 30f665a622ff053ad73b1bd04eebbe18b1abeff33acdc8507ef414eb690ffb4a Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:44:47 +0000 Subject: [PATCH 32/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=48 --- libmarblewidget.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmarblewidget.spec b/libmarblewidget.spec index 1654b09..2965fb7 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -18,7 +18,7 @@ %define _so 22 Name: libmarblewidget -Version: 15.08.0 +Version: 15.08.1 Release: 0 Summary: Generic map viewer library for libkgeomapr License: LGPL-2.1+ From 3d0a30f00a3d7d80bd6873d03fab8b6b92ae3d95ad3fd98e82666510c39ac7aa Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:45:10 +0000 Subject: [PATCH 33/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=49 --- libmarblewidget.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libmarblewidget.changes b/libmarblewidget.changes index 15f1b81..f7aa572 100644 --- a/libmarblewidget.changes +++ b/libmarblewidget.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + ------------------------------------------------------------------- Sun Aug 30 18:20:17 UTC 2015 - tittiatcoke@gmail.com From 20f361b254896047865f3625ccc8e83564f6a3030b398c41ce8129dc316227ea Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:52:33 +0000 Subject: [PATCH 34/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=50 --- marble.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/marble.spec b/marble.spec index 5406bdf..0371dc3 100644 --- a/marble.spec +++ b/marble.spec @@ -24,8 +24,6 @@ Summary: Generic map viewer License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org -# PATCH-FIX-UPSTREAM marble_fix_ppc64_build.patch -- Don't expect LIB_SUFFIX to be set -Patch0: marble_fix_ppc64_build.patch Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel @@ -133,7 +131,6 @@ The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q -%patch0 -p1 %build %ifarch ppc ppc64 From 5f75711063fb4363fe4060e7d6b74fe9f5d8544b741a2588a501b398f8f884b5 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:52:44 +0000 Subject: [PATCH 35/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=51 --- marble.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.changes b/marble.changes index 6605a24..325c62e 100644 --- a/marble.changes +++ b/marble.changes @@ -5,7 +5,7 @@ Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com * 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 - tittiatcoke@gmail.com From addbb2ad88991dc80c4b5b31584b395a5151a97e19a6ee64d83fbf24d08305b3 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:52:55 +0000 Subject: [PATCH 36/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=52 --- libmarblewidget.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libmarblewidget.changes b/libmarblewidget.changes index f7aa572..d2f9c07 100644 --- a/libmarblewidget.changes +++ b/libmarblewidget.changes @@ -5,6 +5,7 @@ Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com * 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 - tittiatcoke@gmail.com From bc8c9c21fb2f17a93b933b74be0cf1f74e18286a4ace4b6a938e180a7cdefde6 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:53:10 +0000 Subject: [PATCH 37/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=53 --- libmarblewidget.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libmarblewidget.spec b/libmarblewidget.spec index 2965fb7..010d017 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -24,8 +24,6 @@ Summary: Generic map viewer library for libkgeomapr License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org -# PATCH-FIX-UPSTREAM marble_fix_ppc64_build.patch -- Don't expect LIB_SUFFIX to be set -Patch0: marble_fix_ppc64_build.patch Source0: marble-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel @@ -55,7 +53,6 @@ The shared library for the MarbleWidget shared library. %prep %setup -q -n marble-%{version} -%patch0 -p1 %build %ifarch ppc ppc64 From 6e694f9996ccbb7c96c614eb461d8a2e25a362ea3e4892fa6c77c03c358f02a1 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:53:15 +0000 Subject: [PATCH 38/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=54 --- marble_fix_ppc64_build.patch | 63 ------------------------------------ 1 file changed, 63 deletions(-) delete mode 100644 marble_fix_ppc64_build.patch diff --git a/marble_fix_ppc64_build.patch b/marble_fix_ppc64_build.patch deleted file mode 100644 index 0e973c2..0000000 --- a/marble_fix_ppc64_build.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6278e93..7aec313 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,10 @@ SET(CMAKE_COLOR_MAKEFILE ON) - - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - -+# Let CMake find the correct library dir instead of -+# relying on the obsolete LIB_SUFFIX parameter -+include(GNUInstallDirs) -+ - # Taken from KDECompilerSettings.cmake: - # Pick sensible versions of the C and C++ standards. - # Note that MSVC does not have equivalent flags; the features are either -@@ -193,11 +197,9 @@ set (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?") - set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer") - add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO") - --# TODO: this could use GNUInstallDirs or ECM, so e.g. LIB_SUFFIX is automatically set --set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) - set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) - if (QT5BUILD) -- set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/plugins) -+ set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) - endif() - - #################################################### -@@ -223,7 +225,7 @@ elseif(APPLE) - SET (plugin_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/plugins) - else() # Linux / bsd etc... - set(data_dir ${CMAKE_INSTALL_PREFIX}/share/marble/data) -- set(plugin_dir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/marble/plugins) -+ set(plugin_dir ${CMAKE_INSTALL_LIBDIR}/marble/plugins) - set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/marble/cmake) - endif() - -diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt -index 677eb7d..dda65a7 100644 ---- a/src/lib/astro/CMakeLists.txt -+++ b/src/lib/astro/CMakeLists.txt -@@ -48,7 +48,7 @@ if(WIN32) - elseif(APPLE) - INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) - else() -- INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) -+ INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - ########### install files ############### -diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt -index 26eda3e..42857ed 100644 ---- a/src/lib/marble/CMakeLists.txt -+++ b/src/lib/marble/CMakeLists.txt -@@ -438,7 +438,7 @@ if(WIN32) - elseif(APPLE) - install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) - else() -- install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) -+ install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - From 15a0977ee93ee1878808008d80b16320eaeb294a619cef01e176bf69cff0b37f Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 20:16:37 +0000 Subject: [PATCH 39/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=55 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index 0371dc3..9eb00c9 100644 --- a/marble.spec +++ b/marble.spec @@ -192,7 +192,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_kf5_libdir}/marble/ %{_kf5_libdir}/plugins/designer/ %{_kf5_plugindir}/libmarble*so -%{_kf5_plugindir}/libplasma_runner_marble.so +#{_kf5_plugindir}/libplasma_runner_marble.so %{_kf5_servicesdir}/*desktop %{_kf5_sharedir}/appdata/ %{_kf5_sharedir}/marble/ From 8375f3fdbfa7a7cfff270e2ac3e3703c16ac02d6c9bf24bcd667085730e83193 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 14 Sep 2015 07:12:04 +0000 Subject: [PATCH 40/40] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=56 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index 9eb00c9..6d39f63 100644 --- a/marble.spec +++ b/marble.spec @@ -192,7 +192,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_kf5_libdir}/marble/ %{_kf5_libdir}/plugins/designer/ %{_kf5_plugindir}/libmarble*so -#{_kf5_plugindir}/libplasma_runner_marble.so +%{_kf5_plugindir}/plasma_runner_marble.so %{_kf5_servicesdir}/*desktop %{_kf5_sharedir}/appdata/ %{_kf5_sharedir}/marble/