Accepting request 207328 from KDE:Distro:Factory

Update to 4.12 Beta 2.  As Michal indicated, the patch should be completely removed (which happens with this request)

OBS-URL: https://build.opensuse.org/request/show/207328
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=43

marble-4.11.2.tar.xz

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

marble-4.11.90.tar.xz

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

marble-designer-plugin.diff

@@ -1,11 +0,0 @@
---- marble/CMakeLists.txt	2008/01/04 14:06:26	1.1
-+++ marble/CMakeLists.txt	2008/01/04 14:06:46
-@@ -75,7 +75,7 @@
- 
- set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werror.")
- set (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?")
--set (WITH_DESIGNER_PLUGIN FALSE CACHE BOOL "Build designer plugin?")
-+set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build designer plugin?")
- if (QTONLY)
-     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)

marble.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Sat Nov 16 17:57:55 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.90
+   * KDE 4.12 Beta 2 release
+   * See http://www.kde.org/announcements/announce-4.12-beta2.php
+- Dropped patch marble-designer-plugin.diff due to 
+   upstream change to activate that particular plugin.
+
+-------------------------------------------------------------------
+Sat Nov  9 22:59:24 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.80
+   * KDE 4.12 Beta 1 release
+   * See http://www.kde.org/announcements/announce-4.12-beta1.php
+
+-------------------------------------------------------------------
+Sat Nov  2 15:12:45 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.3
+   * KDE 4.11.3 bugfix release
+   * See http://www.kde.org/announcements/announce-4.11.3.php
+
 -------------------------------------------------------------------
 Sat Sep 28 15:13:13 UTC 2013 - tittiatcoke@gmail.com
 

marble.spec

@@ -16,15 +16,16 @@
 #
 
 
+%define _so 17
+
 Name:           marble
-Version:        4.11.2
+Version:        4.11.90
 Release:        0
 Summary:        Generic map viewer
 License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
 Source0:        %{name}-%{version}.tar.xz
-Patch1:         marble-designer-plugin.diff
 BuildRequires:  fdupes
 BuildRequires:  gpsd-devel
 BuildRequires:  libkde4-devel
@@ -32,7 +33,7 @@ BuildRequires:  perl
 BuildRequires:  quazip-devel
 BuildRequires:  xz
 Requires:       %{name}-data = %{version}
-Requires:       libmarblewidget16 = %{version}
+Requires:       libmarblewidget%{_so} = %{version}
 Recommends:     %{name}-doc = %{version}
 Provides:       kde4-marble = 4.3.0
 Obsoletes:      kde4-marble < 4.3.0
@@ -56,7 +57,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:       libmarblewidget16 = %{version}
+Requires:       libmarblewidget%{_so} = %{version}
 Provides:       kde4-marble-devel = 4.3.0
 Obsoletes:      kde4-marble-devel < 4.3.0
 
@@ -72,16 +73,15 @@ BuildArch:      noarch
 %description doc
 Marble is a viewer of map data. This package contains its documentation.
 
-%package -n libmarblewidget16
+%package -n libmarblewidget%{_so}
 Summary:        Generic map viewer: Shared Library
 Group:          Development/Libraries/KDE
 
-%description -n libmarblewidget16
+%description -n libmarblewidget%{_so}
 The shared library for the MarbleWidget shared library.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %ifarch ppc ppc64
@@ -95,9 +95,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
   %kde_post_install
   %fdupes -s %{buildroot}
 
-%post   -n libmarblewidget16 -p /sbin/ldconfig
+%post   -n libmarblewidget%{_so} -p /sbin/ldconfig
 
-%postun -n libmarblewidget16 -p /sbin/ldconfig
+%postun -n libmarblewidget%{_so} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -112,11 +112,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %{_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
+%{_kde4_bindir}/marble*
+#{_kde4_bindir}/routing-instructions
+#{_kde4_bindir}/tilecreator
 %{_kde4_configkcfgdir}/marble.kcfg
 %{_kde4_datadir}/mime/packages/geo.xml
 %{_kde4_iconsdir}/hicolor/*/apps/marble.*
@@ -124,7 +122,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %{_kde4_modulesdir}/libmarble_part.so
 %{_kde4_modulesdir}/plasma_applet_worldclock.so
 %{_kde4_modulesdir}/plasma_runner_marble.so
-%{_kde4_modulesdir}/plugins/designer/*
+#{_kde4_modulesdir}/marble/plugins/designer/*
 %{_kde4_modulesdir}/plugins/marble/
 %{_kde4_servicesdir}/*.desktop
 
@@ -143,7 +141,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %defattr(-,root,root)
 %{_kde4_htmldir}/en/marble/
 
-%files -n libmarblewidget16
+%files -n libmarblewidget%{_so}
 %defattr(-,root,root)
 %{_kde4_libdir}/libmarblewidget.so.*