[kdeedu/f13/master: 44/44] Merge remote branch 'origin/master' into f13/master
Rex Dieter
rdieter at fedoraproject.org
Fri Oct 22 11:43:15 UTC 2010
commit 3585b36ac9eaab8c87035e0c040fa116b9f23056
Merge: 35f817b 21c75f8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Oct 22 06:49:15 2010 -0500
Merge remote branch 'origin/master' into f13/master
Conflicts:
.gitignore
kdeedu.spec
sources
.gitignore | 2 +-
kdeedu-4.2.0-indi_nodrivers.patch | 62 ----------------------
kdeedu-4.5.2-kalzium_mimetypes.patch | 11 ++++
kdeedu-4.5.2-marble_gpsd_api.patch | 12 ++++
kdeedu.spec | 93 +++++++++++++++++++++++-----------
sources | 2 +-
6 files changed, 88 insertions(+), 94 deletions(-)
---
diff --cc kdeedu-4.5.2-kalzium_mimetypes.patch
index 0000000,0000000..5c37de5
new file mode 100644
--- /dev/null
+++ b/kdeedu-4.5.2-kalzium_mimetypes.patch
@@@ -1,0 -1,0 +1,11 @@@
++diff -up kdeedu-4.5.2/kalzium/src/kalzium.desktop.kalzium_mimetypes kdeedu-4.5.2/kalzium/src/kalzium.desktop
++--- kdeedu-4.5.2/kalzium/src/kalzium.desktop.kalzium_mimetypes 2010-06-24 11:29:39.000000000 -0500
+++++ kdeedu-4.5.2/kalzium/src/kalzium.desktop 2010-10-11 09:36:16.977639172 -0500
++@@ -4,7 +4,6 @@ Type=Application
++ Exec=kalzium -caption "%c" %i
++ Icon=kalzium
++ X-DocPath=kalzium/index.html
++-MimeType=chemical/x-cml;
++ Comment=KDE Periodic Table of Elements
++ Comment[be]=Перыядычная табліца элементаў KDE
++ Comment[bg]=Таблица на химическите елементи
diff --cc kdeedu-4.5.2-marble_gpsd_api.patch
index 0000000,0000000..29f9c67
new file mode 100644
--- /dev/null
+++ b/kdeedu-4.5.2-marble_gpsd_api.patch
@@@ -1,0 -1,0 +1,12 @@@
++diff -up kdeedu-4.5.2/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.GPSD_API kdeedu-4.5.2/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
++--- kdeedu-4.5.2/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.GPSD_API 2010-09-30 16:21:44.000000000 -0500
+++++ kdeedu-4.5.2/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2010-10-11 12:36:44.189643125 -0500
++@@ -64,7 +64,7 @@ void GpsdPositionProviderPlugin::update(
++ m_position.set( data.fix.longitude, data.fix.latitude,
++ data.fix.altitude, GeoDataCoordinates::Degree );
++ m_accuracy.level = GeoDataAccuracy::Detailed;
++-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 )
+++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 4 )
++ if ( !isnan( data.fix.epx ) && !isnan( data.fix.epy ) ) {
++ m_accuracy.horizontal = qMax( data.fix.epx, data.fix.epy );
++ }
diff --cc kdeedu.spec
index 8db99c8,c69d226..e2a4bd5
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@@ -7,8 -7,8 +7,8 @@@
Name: kdeedu
Summary: Educational/Edutainment applications
- Version: 4.4.5
+ Version: 4.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: Amusements/Games
@@@ -17,10 -17,7 +17,13 @@@ Source0: ftp://ftp.kde.org/pub/kde/stab
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
- # bugzilla.redhat.com/640522
- Patch50: kdeedu-4.2.0-indi_nodrivers.patch
++# fix build using gpsd-2.39
++Patch51: kdeedu-4.5.2-marble_gpsd_api.patch
+
## upstream patches
++# kalzium.desktop: "chemical/x-cml" is an invalid MIME type ("chemical" is an unregistered media type)
++# http://bugzilla.redhat.com/587575 , http://bugs.kde.org/235563
++Patch100: kdeedu-4.5.2-kalzium_mimetypes.patch
Obsoletes: kdeedu4 < %{version}-%{release}
Provides: kdeedu4 = %{version}-%{release}
@@@ -32,7 -31,8 +37,7 @@@ BuildRequires: boost-deve
%if 0%{?fedora}
BuildRequires: cfitsio-devel
BuildRequires: xplanet
- BuildRequires: libindi-devel
-# FIXME: need 0.6.2 backported to F12/F13
+ BuildRequires: libindi-devel >= 0.6.1
BuildRequires: libnova-devel
BuildRequires: libqalculate-devel
BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
@@@ -191,8 -195,6 +200,9 @@@ Group: System Environment/Librarie
%prep
%setup -q -n kdeedu-%{version}%{?alphatag}
- %patch50 -p1 -b .indi_nodrivers
++%patch51 -p1 -b .marble_gpsd_api
++%patch100 -p1 -b .kalzium_mimetypes
+
%build
mkdir -p %{_target_platform}
@@@ -200,7 -202,8 +210,8 @@@ pushd %{_target_platform
%{cmake_kde4} ..
popd
- make -C %{_target_platform}
+ # occasional odd build failures, not %%{?_smp_mflags} safe? -- Rex
-make -C %{_target_platform}
++make %{?_smp_mflags} -C %{_target_platform}
%install
@@@ -576,17 -578,36 +586,40 @@@ rm -rf %{buildroot
%changelog
- * Mon Oct 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.5-2
- - resurrect indi_nodrivers patch (#640522)
++* Mon Oct 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-2
++- kalzium.desktop: drop MimeTypes=chemical/x-cml (#587575, kde#235563)
++- fix build for gpsd-2.39 (f13)
++
+ * Fri Oct 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-1
+ - 4.5.2
+
+ * Fri Aug 27 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.5.1-1
+ - 4.5.1
+ - drop BR: libusb-devel
+
+ * Sun Aug 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-2
+ - BR avogadro-devel >= 1.0.1 and libindi-devel >= 0.6.1
+
+ * Tue Aug 03 2010 Than Ngo <than at redhat.com> - 4.5.0-1
+ - 4.5.0
+
+ * Sat Jul 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.95-1
+ - 4.5 RC3 (4.4.95)
+
+ * Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.92-1
+ - 4.5 RC2 (4.4.92)
+
+ * Fri Jun 25 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.4.90-1
+ - 4.5 RC1 (4.4.90)
- * Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.5-1
- - 4.4.5
+ * Mon Jun 07 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.4.85-1
+ - 4.5 Beta 2 (4.4.85)
- * Wed Jun 02 2010 Than Ngo <than at redhat.com> - 4.4.4-1
- - 4.4.4
+ * Fri May 21 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.4.80-1
+ - 4.5 Beta 1 (4.4.80)
- * Wed May 05 2010 Rex Dieter <rdieter at math.unl.edu> - 4.4.3-1.1
- - rebuild against correct tag
+ * Sat May 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-2
+ - rebuild (gpsd, kdelibs)
* Fri Apr 30 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.4.3-1
- 4.4.3
More information about the scm-commits
mailing list