rpm/marble
SHA256
1
0
Fork 0
forked from pool/marble
Code Pull Requests Activity

Accepting request 147043 from KDE:Distro:Factory

Browse Source 
Update KDE to KDE 4.10 RC2

OBS-URL: https://build.opensuse.org/request/show/147043
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2013-01-07 10:06:34 +00:00 committed by Git OBS Bridge
parent 11d531925c
commit f852517361
4 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
marble-4.9.95.tar.xz
View File

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

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

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

16
marble.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jan 3 21:16:14 UTC 2013 - tittiatcoke@gmail.com
- Update to 4.9.97
* This is the second RC release for 4.10. Contains bugfixes
-------------------------------------------------------------------
Wed Jan 2 22:49:42 UTC 2013 - asterios.dramis@gmail.com
- Removed unneeded build requirements kdebase4-workspace-devel and
libkdeedu4-devel. Added libkde4-devel.
- Removed unneeded runtime requirement for libkeduvocdocument4.
- Recommend instead of Suggest the marble-doc subpackage.
- Replaced marble with libmarblewidget15 in marble-devel Requires:.
- Removed Recommends: entry for marble in libmarblewidget15 (not needed).
-------------------------------------------------------------------
Wed Dec 19 18:43:05 UTC 2012 - tittiatcoke@gmail.com

89
marble.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package marble
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: marble
Version: 4.9.95
Version: 4.9.97
Release: 0
Summary: Generic map viewer
License: LGPL-2.1+
@ -27,15 +27,12 @@ Source0: %{name}-%{version}.tar.xz
Patch1: marble-designer-plugin.diff
BuildRequires: fdupes
BuildRequires: gpsd-devel
BuildRequires: kdebase4-workspace-devel
BuildRequires: libkdeedu4-devel
BuildRequires: libkde4-devel
BuildRequires: perl
BuildRequires: xz
Requires: %{name}-data = %{version}
Requires: libkeduvocdocument4
Requires: libmarblewidget15 = %{version}
Suggests: %{name}-doc = %{version}
Suggests: libkeduvocdocument4
Recommends: %{name}-doc = %{version}
Provides: kde4-marble = 4.3.0
Obsoletes: kde4-marble < 4.3.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -44,24 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Marble is a viewer of map data.
%prep
%setup -q
%patch1 -p1
%build
%ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
%cmake_kde4 -d build
%make_jobs
%install
cd build
%kde4_makeinstall
%suse_update_desktop_file %{name} Education Geography
%kde_post_install
%fdupes -s %{buildroot}
%package data
Summary: Generic map viewer: data
Group: Amusements/Teaching/Other
@ -76,7 +55,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: marble = %{version}
Requires: libmarblewidget15 = %{version}
Provides: kde4-marble-devel = 4.3.0
Obsoletes: kde4-marble-devel < 4.3.0
@ -87,8 +66,6 @@ Development headers and libraries for Marble.
Summary: Marble documentation
Group: Amusements/Teaching/Other
Requires: %{name} = %{version}
Provides: kde4-marble-data = 4.3.0
Obsoletes: kde4-marble-data < 4.3.0
BuildArch: noarch
%description doc
@ -97,38 +74,31 @@ Marble is a viewer of map data. This package contains its documentation.
%package -n libmarblewidget15
Summary: Generic map viewer: Shared Library
Group: Development/Libraries/KDE
Recommends: %{name} = %{version}
%description -n libmarblewidget15
The shared library for the MarbleWidget shared library.
%post -p /sbin/ldconfig
%prep
%setup -q
%patch1 -p1
%postun -p /sbin/ldconfig
%build
%ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
%cmake_kde4 -d build
%make_jobs
%install
%kde4_makeinstall -C build
%suse_update_desktop_file %{name} Education Geography
%kde_post_install
%fdupes -s %{buildroot}
%post -n libmarblewidget15 -p /sbin/ldconfig
%postun -n libmarblewidget15 -p /sbin/ldconfig
%files devel
%defattr(-,root,root)
%doc BUGS CODING TODO
%{_includedir}/marble/
%{_kde4_libdir}/libmarblewidget.so
%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
%files data
%defattr(-,root,root)
%{_kde4_appsdir}/marble/data
%files doc
%defattr(-,root,root)
%{_kde4_htmldir}/en/marble/
%files -n libmarblewidget15
%defattr(-,root,root)
%{_kde4_libdir}/libmarblewidget.so.*
%files
%defattr(-,root,root)
%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
@ -156,4 +126,23 @@ The shared library for the MarbleWidget shared library.
%{_kde4_modulesdir}/plugins/marble/
%{_kde4_servicesdir}/*.desktop
%files devel
%defattr(-,root,root)
%doc BUGS CODING TODO
%{_kde4_includedir}/marble/
%{_kde4_libdir}/libmarblewidget.so
%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
%files data
%defattr(-,root,root)
%{_kde4_appsdir}/marble/data
%files doc
%defattr(-,root,root)
%{_kde4_htmldir}/en/marble/
%files -n libmarblewidget15
%defattr(-,root,root)
%{_kde4_libdir}/libmarblewidget.so.*
%changelog