diff --git a/marble-4.9.3.tar.xz b/marble-4.9.3.tar.xz deleted file mode 100644 index 2bd6c54..0000000 --- a/marble-4.9.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce0e6eab3d903b0053b9fd0023ff522a2619ae15be6e9ccfe7eed3ecd83759b7 -size 19835184 diff --git a/marble-4.9.90.tar.xz b/marble-4.9.90.tar.xz new file mode 100644 index 0000000..d128f4f --- /dev/null +++ b/marble-4.9.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20cc190246852d19ded4d0e00838b6b223bd9307df4bef1436551ed4ca8f30f9 +size 19395720 diff --git a/marble.changes b/marble.changes index 183358e..e712a02 100644 --- a/marble.changes +++ b/marble.changes @@ -1,14 +1,26 @@ +------------------------------------------------------------------- +Sat Dec 1 20:09:17 UTC 2012 - tittiatcoke@gmail.com + +- Update to 4.9.90 + * This is the second Beta release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Sat Nov 24 12:56:31 UTC 2012 - tittiatcoke@gmail.com + +- Update to 4.9.80 + * see http://www.kde.org/announcements/announce-4.10-beta1.php + ------------------------------------------------------------------- Fri Nov 2 16:54:59 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.3 - * see http://kde.org/announcements/4.9.3/ for details + * see http://kde.org/announcements/announce-4.9.3.php for details ------------------------------------------------------------------- Sat Sep 29 10:05:45 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.2 - * see http://kde.org/announcements/4.9.2/ for details + * see http://kde.org/announcements/announce-4.9.2.php for details ------------------------------------------------------------------- Wed Sep 5 12:06:04 UTC 2012 - dmueller@suse.com diff --git a/marble.spec b/marble.spec index c4cf5ac..85abad7 100644 --- a/marble.spec +++ b/marble.spec @@ -17,7 +17,7 @@ Name: marble -Version: 4.9.3 +Version: 4.9.90 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ @@ -33,7 +33,7 @@ BuildRequires: perl BuildRequires: xz Requires: %{name}-data = %{version} Requires: libkeduvocdocument4 -Requires: libmarblewidget14 = %{version} +Requires: libmarblewidget15 = %{version} Suggests: %{name}-doc = %{version} Suggests: libkeduvocdocument4 Provides: kde4-marble = 4.3.0 @@ -57,7 +57,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %install cd build - %make_install + %kde4_makeinstall %suse_update_desktop_file %{name} Education Geography %kde_post_install %fdupes -s %{buildroot} @@ -94,24 +94,25 @@ BuildArch: noarch %description doc Marble is a viewer of map data. This package contains its documentation. -%package -n libmarblewidget14 +%package -n libmarblewidget15 Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE Recommends: %{name} = %{version} -%description -n libmarblewidget14 +%description -n libmarblewidget15 The shared library for the MarbleWidget shared library. %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post -n libmarblewidget14 -p /sbin/ldconfig +%post -n libmarblewidget15 -p /sbin/ldconfig -%postun -n libmarblewidget14 -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 @@ -124,28 +125,33 @@ The shared library for the MarbleWidget shared library. %defattr(-,root,root) %{_kde4_htmldir}/en/marble/ -%files -n libmarblewidget14 +%files -n libmarblewidget15 %defattr(-,root,root) %{_kde4_libdir}/libmarblewidget.so.* %files %defattr(-,root,root) +%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt +%dir %{_kde4_libdir}/qt4/plugins/imports/org +%dir %{_kde4_libdir}/qt4/plugins/imports/org/kde/ +%dir %{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/ %exclude %{_kde4_appsdir}/marble/data -%{_kde4_appsdir}/marble/ %{_kde4_applicationsdir}/marble.desktop +%{_kde4_applicationsdir}/marble_gpx.desktop +%{_kde4_applicationsdir}/marble_kml.desktop +%{_kde4_applicationsdir}/marble_osm.desktop +%{_kde4_appsdir}/marble/ %{_kde4_bindir}/marble %{_kde4_bindir}/marble-touch %{_kde4_bindir}/routing-instructions %{_kde4_bindir}/tilecreator %{_kde4_configkcfgdir}/marble.kcfg +%{_kde4_datadir}/mime/packages/geo.xml %{_kde4_iconsdir}/hicolor/*/apps/marble.* +%{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/marble/ %{_kde4_modulesdir}/libmarble_part.so %{_kde4_modulesdir}/plasma_applet_worldclock.so %{_kde4_modulesdir}/plasma_runner_marble.so -%dir %_kde4_libdir/qt4/plugins/imports/org -%dir %_kde4_libdir/qt4/plugins/imports/org/kde/ -%dir %_kde4_libdir/qt4/plugins/imports/org/kde/edu/ -%_kde4_libdir/qt4/plugins/imports/org/kde/edu/marble/ %{_kde4_modulesdir}/plugins/designer/* %{_kde4_modulesdir}/plugins/marble/ %{_kde4_servicesdir}/*.desktop