From 32bdbe9149f64558b48e35dfd7cd17e396da139b204f95c090437b5910a6665a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 8 Jul 2013 05:32:25 +0000 Subject: [PATCH] Accepting request 182017 from KDE:Distro:Factory Update KDE to KDE 4.10.90 OBS-URL: https://build.opensuse.org/request/show/182017 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=36 --- marble-4.10.4.tar.xz | 3 --- marble-4.10.90.tar.xz | 3 +++ marble.changes | 15 +++++++++++++++ marble.spec | 19 +++++++++++-------- 4 files changed, 29 insertions(+), 11 deletions(-) delete mode 100644 marble-4.10.4.tar.xz create mode 100644 marble-4.10.90.tar.xz diff --git a/marble-4.10.4.tar.xz b/marble-4.10.4.tar.xz deleted file mode 100644 index d23c9a1..0000000 --- a/marble-4.10.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:588d44815cd50fb07ba4a700d1d2d6198b28e6683e5cd56f198fefe78ab820fd -size 19361804 diff --git a/marble-4.10.90.tar.xz b/marble-4.10.90.tar.xz new file mode 100644 index 0000000..730d389 --- /dev/null +++ b/marble-4.10.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff1716ac8365d80bf7385f46e0883bdda2de8d0e1f4fb58905b9ba1f1d4e4185 +size 18974304 diff --git a/marble.changes b/marble.changes index 48a72b9..692ec72 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jun 27 18:19:19 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:26:31 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php +- Added quazip-devel BuildRequires + ------------------------------------------------------------------- Sat Jun 1 09:45:07 UTC 2013 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 8bc114b..467a39a 100644 --- a/marble.spec +++ b/marble.spec @@ -17,7 +17,7 @@ Name: marble -Version: 4.10.4 +Version: 4.10.90 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ @@ -29,9 +29,10 @@ BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: libkde4-devel BuildRequires: perl +BuildRequires: quazip-devel BuildRequires: xz Requires: %{name}-data = %{version} -Requires: libmarblewidget15 = %{version} +Requires: libmarblewidget16 = %{version} Recommends: %{name}-doc = %{version} Provides: kde4-marble = 4.3.0 Obsoletes: kde4-marble < 4.3.0 @@ -55,7 +56,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: libmarblewidget15 = %{version} +Requires: libmarblewidget16 = %{version} Provides: kde4-marble-devel = 4.3.0 Obsoletes: kde4-marble-devel < 4.3.0 @@ -71,11 +72,11 @@ BuildArch: noarch %description doc Marble is a viewer of map data. This package contains its documentation. -%package -n libmarblewidget15 +%package -n libmarblewidget16 Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE -%description -n libmarblewidget15 +%description -n libmarblewidget16 The shared library for the MarbleWidget shared library. %prep @@ -94,9 +95,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %kde_post_install %fdupes -s %{buildroot} -%post -n libmarblewidget15 -p /sbin/ldconfig +%post -n libmarblewidget16 -p /sbin/ldconfig -%postun -n libmarblewidget15 -p /sbin/ldconfig +%postun -n libmarblewidget16 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -109,8 +110,10 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kde4_applicationsdir}/marble_gpx.desktop %{_kde4_applicationsdir}/marble_kml.desktop %{_kde4_applicationsdir}/marble_osm.desktop +%{_kde4_applicationsdir}/marble_kmz.desktop %{_kde4_appsdir}/marble/ %{_kde4_bindir}/marble +%{_kde4_bindir}/marble-qt %{_kde4_bindir}/marble-touch %{_kde4_bindir}/routing-instructions %{_kde4_bindir}/tilecreator @@ -140,7 +143,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %defattr(-,root,root) %{_kde4_htmldir}/en/marble/ -%files -n libmarblewidget15 +%files -n libmarblewidget16 %defattr(-,root,root) %{_kde4_libdir}/libmarblewidget.so.*