rpms/kipi-plugins/F-8 kipi-plugins-0.1.6-kde#174353.patch, NONE, 1.1 kipi-plugins.spec, 1.44, 1.45

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20623

Modified Files:
	kipi-plugins.spec 
Added Files:
	kipi-plugins-0.1.6-kde#174353.patch 
Log Message:
* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
- GPSSync doesn't display maps (rh#471750, kde#174353)


kipi-plugins-0.1.6-kde#174353.patch:

--- NEW FILE kipi-plugins-0.1.6-kde#174353.patch ---
diff -up kipi-plugins-0.1.6/kipi-plugins/gpssync/gpseditdialog.cpp.kde#174353 kipi-plugins-0.1.6/kipi-plugins/gpssync/gpseditdialog.cpp
--- kipi-plugins-0.1.6/kipi-plugins/gpssync/gpseditdialog.cpp.kde#174353	2008-10-11 07:46:33.000000000 -0500
+++ kipi-plugins-0.1.6/kipi-plugins/gpssync/gpseditdialog.cpp	2008-11-20 10:28:11.000000000 -0600
@@ -241,8 +241,14 @@ void GPSEditDialog::readSettings()
     config.setGroup("GPS Sync Settings");
     resize(configDialogSize(config, QString("GPS Edit Dialog")));
 
+    QString mapType = config.readEntry("Map Type", QString("G_NORMAL_MAP"));
+
+    if (mapType == QString("G_SATELLITE_TYPE"))   mapType = QString("G_SATELLITE_MAP");
+    else if (mapType == QString("G_MAP_TYPE"))    mapType = QString("G_NORMAL_MAP");
+    else if (mapType == QString("G_HYBRID_TYPE")) mapType = QString("S_HYBRID_TYPE");
+
+    d->worldMap->setMapType(mapType);
     d->worldMap->setZoomLevel(config.readNumEntry("Zoom Level", 8));
-    d->worldMap->setMapType(config.readEntry("Map Type", QString("G_MAP_TYPE")));
 
     d->altitudeInput->blockSignals(true);
     d->latitudeInput->blockSignals(true);


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-8/kipi-plugins.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kipi-plugins.spec	11 Nov 2008 19:45:36 -0000	1.44
+++ kipi-plugins.spec	20 Nov 2008 16:47:51 -0000	1.45
@@ -12,7 +12,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
@@ -21,6 +21,10 @@
 #Source1: http://www.linux.it/~anaselli/kipi-plugins/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2.md5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://bugs.kde.org/174353
+Patch100: kipi-plugins-0.1.6-kde#174353.patch 
+
 BuildRequires: gettext
 BuildRequires: %{kdelibs3}-devel
 BuildRequires: libkdcraw-devel >= 0.1.5
@@ -109,6 +113,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
+%patch100 -p1 -b .kde#174353
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -181,6 +187,9 @@
 
 
 %changelog
+* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
+- GPSSync doesn't display maps (rh#471750, kde#174353)
+
 * Sun Oct 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-1
 - kipi-plugins-0.1.6