Accepting request 77586 from KDE:Distro:Factory

Provide marble-data subpackage again as a noarch.

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

4_6_BRANCH.diff

@@ -1,7 +0,0 @@
-package: kdeedu-4.2.87svn969966.tar.bz2
-kdemod: kdeedu
---- BRANCH_STATUS
-+++ BRANCH_STATUS
-@@ -0,0 +1,2 @@
-+current HEAD: 970680
-+svn di between //trunk/KDE/kdeedu@969966 and //trunk/KDE/kdeedu

marble.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  1 14:15:36 UTC 2011 - idonmez@novell.com
+
+- Provide marble-data subpackage again 
+
 -------------------------------------------------------------------
 Fri Jul 22 20:28:42 CEST 2011 - dmueller@suse.de
 

marble.spec

@@ -18,89 +18,87 @@
 
 
 Name:           marble
-BuildRequires:  kdebase4-workspace-devel
-BuildRequires:  libkdeedu4-devel
-BuildRequires:  fdupes
-BuildRequires:  perl
-License:        LGPLv2.1+
-Group:          Amusements/Teaching/Other
-Summary:        A generic map viewer
-Url:            http://edu.kde.org
 Version:        4.7.0
 Release:        1
-Source0:        %{name}-%version.tar.bz2
-Patch0:         4_6_BRANCH.diff
+License:        LGPLv2.1+
+Summary:        A generic map viewer
+Url:            http://edu.kde.org
+Group:          Amusements/Teaching/Other
+Source0:        %{name}-%{version}.tar.bz2
 Patch1:         marble-designer-plugin.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
+BuildRequires:  fdupes
+BuildRequires:  kdebase4-workspace-devel
+BuildRequires:  libkdeedu4-devel
+BuildRequires:  perl
 Requires:       libkeduvocdocument4
+Requires:       marble-data = %{version}
 Suggests:       libkeduvocdocument4
 Provides:       kde4-marble = 4.3.0
 Obsoletes:      kde4-marble < 4.3.0
-Provides:       marble-data = %{version}
-Obsoletes:      marble-data < %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%kde4_runtime_requires
 
 %description
 Marble is a viewer of map data
 
-
-Authors:
---------
-    The KDE Team <kde@kde.org>
-
 %prep
-%setup -q -n %{name}-%version
-%patch0 -p0
+%setup -q -n %{name}-%{version}
 %patch1 -p1
 
 %build
 %ifarch ppc ppc64
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %endif
   %cmake_kde4 -d build
   %make_jobs
 
 %install
   cd build
-  %makeinstall
+%make_install
   %suse_update_desktop_file %{name}       Education Geography
   %kde_post_install
-  %if %suse_version > 1020
-  %fdupes -s $RPM_BUILD_ROOT
-  %endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
+  %fdupes -s %{buildroot}
 
 %package devel
 License:        LGPLv2.1+
-Group:          Amusements/Teaching/Other
 Summary:        A generic map viewer: Build Environment
+Group:          Amusements/Teaching/Other
 Requires:       marble
 Provides:       kde4-marble-devel = 4.3.0
 Obsoletes:      kde4-marble-devel < 4.3.0
 
 %description devel
-Marble is a viewer of map data
+Development headers and libraries for Marble.
 
+%package data
+BuildArch:      noarch
+License:        LGPLv2.1+
+Group:          Amusements/Teaching/Other
+Summary:        Generic map viewer data
+Provides:       kde4-marble-data = 4.3.0
+Obsoletes:      kde4-marble-data < 4.3.0
  
-
-Authors:
---------
-    The KDE Team <kde@kde.org>
-
-%files devel
-%defattr(-,root,root)
-/usr/include/marble/
-%_kde4_libdir/libmarblewidget.so
-%_kde4_appsdir/cmake/modules/FindMarble.cmake
+%description data
+Marble is a viewer of map data. This package contains its data.
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%files devel
+%defattr(-,root,root)
+%{_includedir}/marble/
+%_kde4_libdir/libmarblewidget.so
+%_kde4_appsdir/cmake/modules/FindMarble.cmake
+
+%files data
+%defattr(-,root,root)
+%dir %{_datadir}/kde4/apps/marble
+%_kde_share_dir/apps/marble/data
+
 %files
 %defattr(-,root,root)
+%exclude %_kde_share_dir/apps/marble/data
 %_kde4_bindir/geodatatest
 %_kde4_bindir/marble
 %_kde4_bindir/routing-instructions