SHA256
1
0
forked from pool/marble

Accepting request 443456 from home:luca_b:test_KA

KDE Applications - please review

OBS-URL: https://build.opensuse.org/request/show/443456
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=115
This commit is contained in:
Raymond Wooninck 2016-12-03 12:28:01 +00:00 committed by Git OBS Bridge
parent a025c21730
commit 1bc39eadce
4 changed files with 111 additions and 82 deletions

View File

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

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

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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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

View File

@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@ -15,54 +15,62 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define _so -25
%define _so -26
%define _so_astro 1
Name: marble
Version: 16.08.3
Version: 16.11.80
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Generic map viewer
License: LGPL-2.1+
Group: Amusements/Teaching/Other
Url: http://edu.kde.org
Source0: %{name}-%{version}.tar.xz
Source0: marble-%{version}.tar.xz
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: gpsd-devel
BuildRequires: perl
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: kcoreaddons-devel
BuildRequires: kcrash-devel
BuildRequires: kdoctools-devel
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel
BuildRequires: knewstuff-devel
BuildRequires: kparts-devel
BuildRequires: krunner-devel
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(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(Qt5Quick) >= 5.2.0
BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Script) >= 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: kcrash-devel
BuildRequires: kparts-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kdoctools-devel
BuildRequires: ki18n-devel
BuildRequires: phonon4qt5-devel
BuildRequires: kservice-devel
BuildRequires: krunner-devel
BuildRequires: libquazip-qt5-devel
Requires: libmarblewidget-qt5%{_so} = %{version}
BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0
Requires: %{name}-data = %{version}
Requires: libastro1 = %{version}
Requires: libastro-qt5%{_so_astro} = %{version}
Requires: libmarblewidget-qt5%{_so} = %{version}
Requires: marble-frontend = %{version}
Recommends: %{name}-doc = %{version}
Obsoletes: marble5 < %{version}
Provides: marble5 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -72,27 +80,29 @@ Marble is a viewer of map data.
Summary: Qt Frontend for Marble
Group: Amusements/Teaching/Other
Requires: %{name} = %{version}
Provides: marble-frontend = %{version}
Conflicts: otherproviders(marble-frontend)
Provides: marble-frontend = %{version}
%description qt
The Qt frontend for the Marble map viewer
%package kde
Summary: The KDE optimized frontend for Marble
Summary: The KDE optimized frontend for Marble and several Plasmoids/Wallpapers
Group: Amusements/Teaching/Other
Requires: %{name} = %{version}
Provides: marble-frontend = %{version}
Conflicts: otherproviders(marble-frontend)
Supplements: packageand(marble:plasma5-desktop)
Conflicts: otherproviders(marble-frontend)
Provides: marble-frontend = %{version}
%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
Summary: Generic map viewer: data
Group: Amusements/Teaching/Other
Requires: %{name} = %{version}
Obsoletes: marble5-data < %{version}
Provides: marble5-data < %{version}
BuildArch: noarch
%description data
@ -101,8 +111,10 @@ 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: libastro%{_so_astro} = %{version}
Requires: libmarblewidget-qt5%{_so} = %{version}
Requires: libastro1 = %{version}
Obsoletes: marble5-devel < %{version}
Provides: marble5-devel = %{version}
%description devel
Development headers and libraries for Marble.
@ -111,6 +123,8 @@ Development headers and libraries for Marble.
Summary: Marble documentation
Group: Amusements/Teaching/Other
Requires: %{name} = %{version}
Obsoletes: marble5-doc < %{version}
Provides: marble5-doc = %{version}
BuildArch: noarch
%description doc
@ -123,24 +137,27 @@ Group: Development/Libraries/KDE
%description -n libmarblewidget-qt5%{_so}
The shared library for the MarbleWidget shared library.
%package -n libastro1
%package -n libastro%{_so_astro}
Summary: Astronomy: Shared Library
Group: Development/Libraries/KDE
Requires: libmarblewidget-qt5%{_so}
Obsoletes: libastro-qt5%{_so_astro} < %{version}
Provides: libastro-qt5%{_so_astro} = %{version}
%description -n libastro1
The Astronomy shared library for the MarbleWidget shared library.
%description -n libastro%{_so_astro}
The astronomy library for the satellites plugin.
%prep
%setup -q
%setup -q -n marble-%{version}
%build
export SUSE_ASNEEDED=0
%ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
export SUSE_ASNEEDED=0
mkdir build
pushd build
cd build
# FIXME: you should use %%cmake macros
cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
-DCMAKE_INSTALL_PREFIX=%{_kf5_prefix} \
-DCMAKE_PREFIX_PATH=%{_kf5_prefix} \
@ -154,50 +171,52 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
-DBUILD_TESTING=OFF \
-DBUILD_MARBLE_TESTS=NO \
-DMOBILE=FALSE \
-DWITH_KF5=TRUE \
-DKDE_INSTALL_METAINFODIR=%{_kf5_appstreamdir} \
%ifarch x86_64
-DLIB_SUFFIX=64 \
%endif
-DWITH_KF5=TRUE \
..
%make_jobs
%install
%kf5_makeinstall -C build
%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}
#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
%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
%post -n libastro1 -p /sbin/ldconfig
%postun -n libastro1 -p /sbin/ldconfig
%post -n libastro%{_so_astro} -p /sbin/ldconfig
%postun -n libastro%{_so_astro} -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
%dir %{_kf5_libdir}/plugins/
%exclude %{_kf5_sharedir}/marble/data
%{_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}/
%{_datadir}/marble/
%{_datadir}/metainfo/
%{_kf5_iconsdir}/hicolor/*/apps/marble.*
%{_kf5_kxmlguidir}/marble/
%_libdir/libmarbledeclarative.so
%{_kf5_libdir}/marble/
%{_kf5_libdir}/plugins/designer/
%{_libdir}/marble/
%{_libdir}/libmarbledeclarative.so
%dir %{_libdir}/plugins/
%{_libdir}/plugins/designer/
%exclude %{_datadir}/marble/data
%{_kf5_plugindir}/libmarble*so
%{_kf5_plugindir}/plasma_runner_marble.so
%{_kf5_servicesdir}/*desktop
%{_kf5_sharedir}/marble/
%{_kf5_sharedir}/mime/packages/geo.xml
%{_kf5_applicationsdir}/marble_gpx.desktop
%{_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
%defattr(-,root,root)
@ -206,12 +225,13 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%{_includedir}/astro/
%{_kf5_libdir}/libmarblewidget-qt5.so
%{_kf5_libdir}/libastro.so
%{_libdir}/cmake/Astro/
%{_libdir}/cmake/Marble/
%{_kf5_libdir}/cmake/Astro/
%{_kf5_libdir}/cmake/Marble/
%{_libdir}/qt5/mkspecs/modules/qt_Marble.pri
%files data
%defattr(-,root,root)
%{_kf5_sharedir}/marble/data
%{_datadir}/marble/data
%files doc
%defattr(-,root,root)
@ -221,20 +241,21 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%defattr(-,root,root)
%{_kf5_libdir}/libmarblewidget-qt5.so.*
%files -n libastro1
%files -n libastro%{_so_astro}
%defattr(-,root,root)
%{_kf5_libdir}/libastro.so.*
%files qt
%defattr(-,root,root)
%{_kf5_applicationsdir}/marble-qt.desktop
%{_kf5_applicationsdir}/org.kde.marble-qt.desktop
%{_kf5_bindir}/marble-qt
%files kde
%defattr(-,root,root)
%{_kf5_applicationsdir}/marble.desktop
%{_kf5_applicationsdir}/org.kde.marble.desktop
%{_kf5_bindir}/marble
%dir %{_kf5_appstreamdir}
%{_kf5_appstreamdir}/marble.appdata.xml
%dir %{_datadir}/plasma
%{_datadir}/plasma/plasmoids/
%{_datadir}/plasma/wallpapers/
%changelog