rpm/marble
SHA256
1
0
Fork 0
forked from pool/marble
Code Pull Requests Activity

Accepting request 446157 from KDE:Applications

Browse Source 
Update to KDE Applicatons 16.12.0

OBS-URL: https://build.opensuse.org/request/show/446157
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=84
This commit is contained in:
Dominique Leuenberger 2016-12-17 09:56:10 +00:00 committed by Git OBS Bridge
commit c549a06e56
4 changed files with 128 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
marble-16.08.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c2d3263a55cde6511b703548399f48a1d9d0c33cb57283cc304d07189e8aa53
size 23144576

3
marble-16.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d4167254399556ee1ed89920047f27ecab92e280a171eb51be60ba330e7171a
size 23505992

35
marble.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Tue Dec 13 20:02:40 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.12.0
* KDE Applications 16.12.0
* https://www.kde.org/announcements/announce-applications-16.12.0.php
-------------------------------------------------------------------
Mon Dec 5 16:30:25 UTC 2016 - wbauer@tmo.at
- Install the designer plugins to the correct location
-------------------------------------------------------------------
Mon Dec 5 10:35:37 UTC 2016 - wbauer@tmo.at
- Use proper cmake macro for building, remove obsolete WITH_KF5
option
-------------------------------------------------------------------
Sat Dec 3 16:45:54 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.11.90
* KDE Applications 16.12.0 RC
* https://www.kde.org/announcements/announce-applications-16.12-rc.php
-------------------------------------------------------------------
Tue Nov 29 12:42:23 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.11.80
* KDE Applications 16.12.0 Beta
* https://www.kde.org/announcements/announce-applications-16.12-beta.php
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 9 06:27:57 UTC 2016 - lbeltrame@kde.org Wed Nov 9 06:27:57 UTC 2016 - lbeltrame@kde.org

185
marble.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package marble # spec file for package marble
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,54 +15,62 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define _so -25
%define _so -26
%define _so_astro 1
Name: marble Name: marble
Version: 16.08.3 Version: 16.12.0
Release: 0 Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Generic map viewer Summary: Generic map viewer
License: LGPL-2.1+ License: LGPL-2.1+
Group: Amusements/Teaching/Other Group: Amusements/Teaching/Other
Url: http://edu.kde.org Url: http://edu.kde.org
Source0: %{name}-%{version}.tar.xz Source0: marble-%{version}.tar.xz
BuildRequires: extra-cmake-modules
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gpsd-devel BuildRequires: gpsd-devel
BuildRequires: perl
BuildRequires: kconfig-devel BuildRequires: kconfig-devel
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: kcoreaddons-devel
BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 BuildRequires: kcrash-devel
BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 BuildRequires: kdoctools-devel
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: kf5-filesystem
BuildRequires: pkgconfig(Qt5Script) >= 5.2.0 BuildRequires: ki18n-devel
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: knewstuff-devel
BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0 BuildRequires: kparts-devel
BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 BuildRequires: krunner-devel
BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 BuildRequires: kservice-devel
BuildRequires: kwallet-devel
BuildRequires: libqt5-qtlocation-devel
BuildRequires: libquazip-qt5-devel
BuildRequires: perl
BuildRequires: phonon4qt5-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Designer) >= 5.2.0
BuildRequires: pkgconfig(Qt5Network) >= 5.2.0
BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0
BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0 BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0
BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0 BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0
BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0 BuildRequires: pkgconfig(Qt5Script) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5SerialPort) >= 5.2.0 BuildRequires: pkgconfig(Qt5SerialPort) >= 5.2.0
BuildRequires: pkgconfig(Qt5Designer) >= 5.2.0 BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0
BuildRequires: extra-cmake-modules BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: kwallet-devel BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0
BuildRequires: knewstuff-devel BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: kcrash-devel BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0
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: %{name}-data = %{version}
Requires: libastro1 = %{version} Requires: libastro-qt5%{_so_astro} = %{version}
Requires: libmarblewidget-qt5%{_so} = %{version}
Requires: marble-frontend = %{version} Requires: marble-frontend = %{version}
Recommends: %{name}-doc = %{version} Recommends: %{name}-doc = %{version}
Obsoletes: marble5 < %{version}
Provides: marble5 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -72,27 +80,29 @@ Marble is a viewer of map data.
Summary: Qt Frontend for Marble Summary: Qt Frontend for Marble
Group: Amusements/Teaching/Other Group: Amusements/Teaching/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
Provides: marble-frontend = %{version}
Conflicts: otherproviders(marble-frontend) Conflicts: otherproviders(marble-frontend)
Provides: marble-frontend = %{version}
%description qt %description qt
The Qt frontend for the Marble map viewer The Qt frontend for the Marble map viewer
%package kde %package kde
Summary: The KDE optimized frontend for Marble Summary: The KDE optimized frontend for Marble and several Plasmoids/Wallpapers
Group: Amusements/Teaching/Other Group: Amusements/Teaching/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
Provides: marble-frontend = %{version}
Conflicts: otherproviders(marble-frontend)
Supplements: packageand(marble:plasma5-desktop) Supplements: packageand(marble:plasma5-desktop)
Conflicts: otherproviders(marble-frontend)
Provides: marble-frontend = %{version}
%description kde %description kde
The KDE frontend for the Marble map viewer The KDE frontend for the Marble map viewer. It also includes several plasmoids and wallpapers for Plasma
%package data %package data
Summary: Generic map viewer: data Summary: Generic map viewer: data
Group: Amusements/Teaching/Other Group: Amusements/Teaching/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
Obsoletes: marble5-data < %{version}
Provides: marble5-data < %{version}
BuildArch: noarch BuildArch: noarch
%description data %description data
@ -101,8 +111,10 @@ Marble is a viewer of map data. This package contains its data.
%package devel %package devel
Summary: Generic map viewer: Build Environment Summary: Generic map viewer: Build Environment
Group: Development/Libraries/KDE Group: Development/Libraries/KDE
Requires: libastro%{_so_astro} = %{version}
Requires: libmarblewidget-qt5%{_so} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version}
Requires: libastro1 = %{version} Obsoletes: marble5-devel < %{version}
Provides: marble5-devel = %{version}
%description devel %description devel
Development headers and libraries for Marble. Development headers and libraries for Marble.
@ -111,6 +123,8 @@ Development headers and libraries for Marble.
Summary: Marble documentation Summary: Marble documentation
Group: Amusements/Teaching/Other Group: Amusements/Teaching/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
Obsoletes: marble5-doc < %{version}
Provides: marble5-doc = %{version}
BuildArch: noarch BuildArch: noarch
%description doc %description doc
@ -123,81 +137,60 @@ Group: Development/Libraries/KDE
%description -n libmarblewidget-qt5%{_so} %description -n libmarblewidget-qt5%{_so}
The shared library for the MarbleWidget shared library. The shared library for the MarbleWidget shared library.
%package -n libastro1 %package -n libastro%{_so_astro}
Summary: Astronomy: Shared Library Summary: Astronomy: Shared Library
Group: Development/Libraries/KDE Group: Development/Libraries/KDE
Requires: libmarblewidget-qt5%{_so}
Obsoletes: libastro-qt5%{_so_astro} < %{version}
Provides: libastro-qt5%{_so_astro} = %{version}
%description -n libastro1 %description -n libastro%{_so_astro}
The Astronomy shared library for the MarbleWidget shared library. The astronomy library for the satellites plugin.
%prep %prep
%setup -q %setup -q -n marble-%{version}
%build %build
export SUSE_ASNEEDED=0
%ifarch ppc ppc64 %ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif %endif
%cmake_kf5 -d build -- -DBUILD_MARBLE_TESTS=NO -DMOBILE=FALSE -DQT_PLUGINS_DIR=%{_kf5_plugindir}
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 \
-DMOBILE=FALSE \
-DWITH_KF5=TRUE \
-DKDE_INSTALL_METAINFODIR=%{_kf5_appstreamdir} \
..
%make_jobs %make_jobs
%install %install
%kf5_makeinstall -C build %kf5_makeinstall -C build
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop
rm -rf %{buildroot}/designer
rm -rf %{buildroot}%{_kf5_bindir}/marble-touch
%fdupes -s %{buildroot}
%post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig %post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
%post -n libastro%{_so_astro} -p /sbin/ldconfig
%post -n libastro1 -p /sbin/ldconfig %postun -n libastro%{_so_astro} -p /sbin/ldconfig
%postun -n libastro1 -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
%dir %{_kf5_libdir}/plugins/ %{_datadir}/marble/
%exclude %{_kf5_sharedir}/marble/data %{_kf5_appstreamdir}/
%{_kf5_applicationsdir}/marble_geo.desktop
%{_kf5_applicationsdir}/marble_gpx.desktop
%{_kf5_applicationsdir}/marble_kml.desktop
%{_kf5_applicationsdir}/marble_kmz.desktop
%{_kf5_applicationsdir}/marble_worldwind.desktop
%{_kf5_applicationsdir}/marble_geojson.desktop
%{_kf5_configdir}/marble.knsrc
%{_kf5_configkcfgdir}/
%{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_iconsdir}/hicolor/*/apps/marble.*
%{_kf5_kxmlguidir}/marble/ %{_libdir}/marble/
%_libdir/libmarbledeclarative.so %{_libdir}/libmarbledeclarative.so
%{_kf5_libdir}/marble/ %{_kf5_plugindir}/designer/
%{_kf5_libdir}/plugins/designer/ %exclude %{_datadir}/marble/data
%{_kf5_plugindir}/libmarble*so %{_kf5_plugindir}/libmarble*so
%{_kf5_plugindir}/plasma_runner_marble.so %{_kf5_plugindir}/plasma_runner_marble.so
%{_kf5_servicesdir}/*desktop %{_kf5_servicesdir}/*desktop
%{_kf5_sharedir}/marble/ %{_kf5_applicationsdir}/marble_gpx.desktop
%{_kf5_sharedir}/mime/packages/geo.xml %{_kf5_applicationsdir}/marble_kml.desktop
%{_kf5_applicationsdir}/marble_kmz.desktop
%{_kf5_applicationsdir}/marble_geo.desktop
%{_kf5_applicationsdir}/marble_worldwind.desktop
%{_kf5_applicationsdir}/marble_geojson.desktop
%{_kf5_configkcfgdir}/
%{_kf5_kxmlguidir}/marble/
%{_datadir}/mime/packages/geo.xml
%{_kf5_qmldir}/org/kde/marble/
%{_kf5_configdir}/marble.knsrc
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
@ -206,12 +199,13 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%{_includedir}/astro/ %{_includedir}/astro/
%{_kf5_libdir}/libmarblewidget-qt5.so %{_kf5_libdir}/libmarblewidget-qt5.so
%{_kf5_libdir}/libastro.so %{_kf5_libdir}/libastro.so
%{_libdir}/cmake/Astro/ %{_kf5_libdir}/cmake/Astro/
%{_libdir}/cmake/Marble/ %{_kf5_libdir}/cmake/Marble/
%{_libdir}/qt5/mkspecs/modules/qt_Marble.pri
%files data %files data
%defattr(-,root,root) %defattr(-,root,root)
%{_kf5_sharedir}/marble/data %{_datadir}/marble/data
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
@ -221,20 +215,21 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%defattr(-,root,root) %defattr(-,root,root)
%{_kf5_libdir}/libmarblewidget-qt5.so.* %{_kf5_libdir}/libmarblewidget-qt5.so.*
%files -n libastro1 %files -n libastro%{_so_astro}
%defattr(-,root,root) %defattr(-,root,root)
%{_kf5_libdir}/libastro.so.* %{_kf5_libdir}/libastro.so.*
%files qt %files qt
%defattr(-,root,root) %defattr(-,root,root)
%{_kf5_applicationsdir}/marble-qt.desktop %{_kf5_applicationsdir}/org.kde.marble-qt.desktop
%{_kf5_bindir}/marble-qt %{_kf5_bindir}/marble-qt
%files kde %files kde
%defattr(-,root,root) %defattr(-,root,root)
%{_kf5_applicationsdir}/marble.desktop %{_kf5_applicationsdir}/org.kde.marble.desktop
%{_kf5_bindir}/marble %{_kf5_bindir}/marble
%dir %{_kf5_appstreamdir} %dir %{_datadir}/plasma
%{_kf5_appstreamdir}/marble.appdata.xml %{_datadir}/plasma/plasmoids/
%{_datadir}/plasma/wallpapers/
%changelog %changelog