[kdepim-runtime] 4.8.90

[Rex Dieter]

commit 7bb91457ee7b16dffdcad89c63efa2210cd5a15c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jun 10 07:58:12 2012 -0500

    4.8.90

 .gitignore                                         |    1 +
 ... kdepim-runtime-4.8.90-akonadi_kcm_sqlite.patch |   47 ++++++--------------
 kdepim-runtime.spec                                |    7 ++-
 sources                                            |    2 +-
 4 files changed, 21 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26d617d..2577d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kdepim-runtime-4.7.4.tar.bz2
 /kdepim-runtime-4.8.3.tar.xz
 /kdepim-runtime-4.8.80.tar.xz
+/kdepim-runtime-4.8.90.tar.xz
diff --git a/0001-add-sqlite-support-to-akonadi-kcm.patch b/kdepim-runtime-4.8.90-akonadi_kcm_sqlite.patch
similarity index 56%
rename from 0001-add-sqlite-support-to-akonadi-kcm.patch
rename to kdepim-runtime-4.8.90-akonadi_kcm_sqlite.patch
index ac2b06a..22f4323 100644
--- a/0001-add-sqlite-support-to-akonadi-kcm.patch
+++ b/kdepim-runtime-4.8.90-akonadi_kcm_sqlite.patch
@@ -1,20 +1,7 @@
-From 09f49bbbcc876c40db51a9a1240be058fc1bd367 Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter at fedoraproject.org>
-Date: Wed, 8 Feb 2012 09:17:41 -0600
-Subject: [PATCH] add sqlite support to akonadi kcm
-
-https://git.reviewboard.kde.org/r/103894
-
----
- kcm/serverconfigmodule.cpp |   18 +++++++++++++++++-
- kcm/serverconfigmodule.h   |    1 +
- 2 files changed, 18 insertions(+), 1 deletions(-)
-
-diff --git a/kcm/serverconfigmodule.cpp b/kcm/serverconfigmodule.cpp
-index 930b6c8..c674cd6 100644
---- a/kcm/serverconfigmodule.cpp
-+++ b/kcm/serverconfigmodule.cpp
-@@ -57,6 +57,7 @@ ServerConfigModule::ServerConfigModule( QWidget * parent, const QVariantList & a
+diff -up kdepim-runtime-4.8.90/kcm/serverconfigmodule.cpp.akonadi_kcm_sqlite kdepim-runtime-4.8.90/kcm/serverconfigmodule.cpp
+--- kdepim-runtime-4.8.90/kcm/serverconfigmodule.cpp.akonadi_kcm_sqlite	2012-06-06 17:47:53.000000000 -0500
++++ kdepim-runtime-4.8.90/kcm/serverconfigmodule.cpp	2012-06-10 07:56:33.487146422 -0500
+@@ -57,6 +57,7 @@ ServerConfigModule::ServerConfigModule(
    // supported drivers
    ui_driver.driverBox->addItem( "Mysql", QVariant( "QMYSQL" ) );
    ui_driver.driverBox->addItem( "PostgreSQL", QVariant( "QPSQL" ) );
@@ -22,7 +9,7 @@ index 930b6c8..c674cd6 100644
  
    setButtons( KCModule::Default | KCModule::Apply );
  
-@@ -69,6 +70,12 @@ ServerConfigModule::ServerConfigModule( QWidget * parent, const QVariantList & a
+@@ -69,6 +70,12 @@ ServerConfigModule::ServerConfigModule(
    m_psqlWidget = new QWidget( this );
    m_stackWidget->addWidget( m_psqlWidget );
    ui_psql.setupUi( m_psqlWidget );
@@ -48,25 +35,22 @@ index 930b6c8..c674cd6 100644
    // selected driver
    settings.beginGroup( "GENERAL" );
    settings.setValue( "Driver", ui_driver.driverBox->itemData( ui_driver.driverBox->currentIndex() ).toString() );
-@@ -221,9 +234,12 @@ void ServerConfigModule::driverChanged( int index )
-   if( ui_driver.driverBox->itemData( index ).toString() == "QMYSQL" ) {
+@@ -220,8 +233,10 @@ void ServerConfigModule::driverChanged(
+ {
+   if ( ui_driver.driverBox->itemData( index ).toString() == "QMYSQL" ) {
      m_stackWidget->setCurrentWidget( m_mysqlWidget );
-   }
--  else {
+-  } else {
 +  else if( ui_driver.driverBox->itemData( index ).toString() == "QPSQL" ) {
      m_stackWidget->setCurrentWidget( m_psqlWidget );
-   }
 +  else {
 +    m_stackWidget->setCurrentWidget( m_sqliteWidget );
-+  }
+   }
  }
  
- #include "serverconfigmodule.moc"
-diff --git a/kcm/serverconfigmodule.h b/kcm/serverconfigmodule.h
-index 1a50c63..fef1aa5 100644
---- a/kcm/serverconfigmodule.h
-+++ b/kcm/serverconfigmodule.h
-@@ -56,6 +56,7 @@ class ServerConfigModule : public KCModule
+diff -up kdepim-runtime-4.8.90/kcm/serverconfigmodule.h.akonadi_kcm_sqlite kdepim-runtime-4.8.90/kcm/serverconfigmodule.h
+--- kdepim-runtime-4.8.90/kcm/serverconfigmodule.h.akonadi_kcm_sqlite	2012-05-22 19:24:00.000000000 -0500
++++ kdepim-runtime-4.8.90/kcm/serverconfigmodule.h	2012-06-10 07:54:51.669419323 -0500
+@@ -56,6 +56,7 @@ class ServerConfigModule : public KCModu
      QStackedWidget *m_stackWidget;
      QWidget *m_mysqlWidget;
      QWidget *m_psqlWidget;
@@ -74,6 +58,3 @@ index 1a50c63..fef1aa5 100644
  
      QComboBox *m_driverBox;
  };
--- 
-1.7.7.6
-
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 208bf53..2a6c2ba 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -4,7 +4,7 @@
 Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Epoch:   1
-Version: 4.8.80
+Version: 4.8.90
 Release: 1%{?dist}
 
 License: GPLv2
@@ -24,7 +24,7 @@ Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
 ## upstreamable patches
 # Enable SQLite support in akonadi kcm
 # https://git.reviewboard.kde.org/r/103894
-Patch50: 0001-add-sqlite-support-to-akonadi-kcm.patch 
+Patch50: kdepim-runtime-4.8.90-akonadi_kcm_sqlite.patch 
 
 ## upstream patches
 
@@ -151,6 +151,9 @@ fi
 
 
 %changelog
+* Sun Jun 10 2012 Rex Dieter <rdieter at fedoraproject.org> - 1:4.8.90-1
+- 4.8.90
+
 * Sun Jun 03 2012 Jaroslav Reznik <jreznik at redhat.com> - 1:4.8.80-1
 - 4.8.80
 
diff --git a/sources b/sources
index 6143b54..e17d2bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea3a21853159d5724d9ad19ec79aac4b  kdepim-runtime-4.8.80.tar.xz
+99035117b0c64fa2052f97b5d6faf9ce  kdepim-runtime-4.8.90.tar.xz