Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at Tue Aug 2 08:57:45 CEST 2011.
-------- --- marble/marble.changes 2011-07-22 20:28:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/marble/marble.changes 2011-08-01 16:23:10.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 1 14:15:36 UTC 2011 - [email protected] + +- Provide marble-data subpackage again + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_6_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.Fu2Vww/_old 2011-08-02 08:56:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Fu2Vww/_new 2011-08-02 08:56:42.000000000 +0200 @@ -18,89 +18,87 @@ Name: marble -BuildRequires: kdebase4-workspace-devel -BuildRequires: libkdeedu4-devel -BuildRequires: fdupes -BuildRequires: perl +Version: 4.7.0 +Release: 3 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 +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 <[email protected]> - %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 +%description data +Marble is a viewer of map data. This package contains its data. -Authors: --------- - The KDE Team <[email protected]> +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files devel %defattr(-,root,root) -/usr/include/marble/ +%{_includedir}/marble/ %_kde4_libdir/libmarblewidget.so %_kde4_appsdir/cmake/modules/FindMarble.cmake -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
