From dedc69d6819c1f07ef52758694506c5c815d3990249bc26695daa5cbf265cf08 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 18 Mar 2014 16:10:19 +0000 Subject: [PATCH] Accepting request 226152 from KDE:Distro:Factory Update to KDE 4.13 Beta 2 OBS-URL: https://build.opensuse.org/request/show/226152 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=48 --- marble-4.12.2.tar.xz | 3 --- marble-4.12.90.tar.xz | 3 +++ marble.changes | 14 ++++++++++++++ marble.spec | 24 ++++++++++++++++++++++-- 4 files changed, 39 insertions(+), 5 deletions(-) delete mode 100644 marble-4.12.2.tar.xz create mode 100644 marble-4.12.90.tar.xz diff --git a/marble-4.12.2.tar.xz b/marble-4.12.2.tar.xz deleted file mode 100644 index 8ef2c1e..0000000 --- a/marble-4.12.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74ea3b63e874a6d59b3a2db724b11c56592a9fe67c51290f01fc9d6526c3eabb -size 18683696 diff --git a/marble-4.12.90.tar.xz b/marble-4.12.90.tar.xz new file mode 100644 index 0000000..346a9d0 --- /dev/null +++ b/marble-4.12.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:060e6fe95b752d0b65bdcd02b63834a12d1479db46782d111f3438e1377ab49d +size 19412488 diff --git a/marble.changes b/marble.changes index a4aa6d0..fe9c047 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Mar 13 20:18:02 UTC 2014 - tittiatcoke@gmail.com + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Fri Mar 7 10:09:50 UTC 2014 - tittiatcoke@gmail.com + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + ------------------------------------------------------------------- Sat Feb 1 10:15:06 UTC 2014 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index be90061..6210a92 100644 --- a/marble.spec +++ b/marble.spec @@ -16,10 +16,10 @@ # -%define _so 17 +%define _so 18 Name: marble -Version: 4.12.2 +Version: 4.12.90 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ @@ -33,6 +33,7 @@ BuildRequires: perl BuildRequires: quazip-devel BuildRequires: xz Requires: %{name}-data = %{version} +Requires: libastro1 = %{version} Requires: libmarblewidget%{_so} = %{version} Recommends: %{name}-doc = %{version} Provides: kde4-marble = 4.3.0 @@ -80,6 +81,13 @@ Group: Development/Libraries/KDE %description -n libmarblewidget%{_so} The shared library for the MarbleWidget shared library. +%package -n libastro1 +Summary: Astronomy: Shared Library +Group: Development/Libraries/KDE + +%description -n libastro1 +The Astronomy shared library for the MarbleWidget shared library. + %prep %setup -q @@ -99,6 +107,10 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %postun -n libmarblewidget%{_so} -p /sbin/ldconfig +%post -n libastro1 -p /sbin/ldconfig + +%postun -n libastro1 -p /sbin/ldconfig + %files %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt @@ -114,6 +126,8 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kde4_applicationsdir}/marble-mobile.desktop %{_kde4_applicationsdir}/marble-qt.desktop %{_kde4_applicationsdir}/marble-touch.desktop +%{_kde4_applicationsdir}/marble_geo.desktop +%{_kde4_applicationsdir}/marble_worldwind.desktop %{_kde4_appsdir}/marble/ %{_kde4_bindir}/marble* #{_kde4_bindir}/routing-instructions @@ -133,7 +147,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %defattr(-,root,root) %doc BUGS CODING TODO %{_kde4_includedir}/marble/ +%{_kde4_includedir}/astro/ %{_kde4_libdir}/libmarblewidget.so +%{_kde4_libdir}/libastro.so %{_kde4_appsdir}/cmake/modules/FindMarble.cmake %files data @@ -148,4 +164,8 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %defattr(-,root,root) %{_kde4_libdir}/libmarblewidget.so.* +%files -n libastro1 +%defattr(-,root,root) +%{_kde4_libdir}/libastro.so.* + %changelog