diff --git a/.cvsignore b/.cvsignore
index e485c01..8b3de13 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-akonadi-1.1.1.tar.bz2
+akonadi-1.1.2.tar.bz2
diff --git a/akonadi-1.1.1-startup-2.patch b/akonadi-1.1.1-startup-2.patch
deleted file mode 100644
index 72614a6..0000000
--- a/akonadi-1.1.1-startup-2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- branches/akonadi/1.1/server/src/akonadi.cpp	2009/01/03 16:17:31	905029
-+++ branches/akonadi/1.1/server/src/akonadi.cpp	2009/02/25 10:55:29	931467
-@@ -225,23 +225,30 @@
-   const QString actualConfig = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi" ) ) + QLatin1String("/mysql.conf");
-   if ( globalConfig.isEmpty() )
-     akFatal() << "Did not find MySQL server default configuration (mysql-global.conf)";
--  QFile globalFile( globalConfig );
--  QFile actualFile( actualConfig );
--  if ( globalFile.open( QFile::ReadOnly ) && actualFile.open( QFile::WriteOnly ) ) {
--    actualFile.write( globalFile.readAll() );
--    if ( !localConfig.isEmpty() ) {
--      QFile localFile( localConfig );
--      if ( localFile.open( QFile::ReadOnly ) ) {
--        actualFile.write( localFile.readAll() );
--        localFile.close();
-+  bool confUpdate = false;
-+  QFile actualFile ( actualConfig );
-+  // update conf only if either global (or local) is newer than actual
-+  if ( (QFileInfo( globalConfig ).lastModified() > QFileInfo( actualFile ).lastModified()) ||
-+       (QFileInfo( localConfig ).lastModified()  > QFileInfo( actualFile ).lastModified()) )
-+  {
-+    QFile globalFile( globalConfig );
-+    QFile localFile ( localConfig );
-+    if ( globalFile.open( QFile::ReadOnly ) && actualFile.open( QFile::WriteOnly ) ) {
-+      actualFile.write( globalFile.readAll() );
-+      if ( !localConfig.isEmpty() ) {
-+        if ( localFile.open( QFile::ReadOnly ) ) {
-+          actualFile.write( localFile.readAll() );
-+          localFile.close();
-+        }
-       }
-+      globalFile.close();
-+      actualFile.close();
-+      confUpdate = true;
-+    } else {
-+      akError() << "Unable to create MySQL server configuration file.";
-+      akError() << "This means that either the default configuration file (mysql-global.conf) was not readable";
-+      akFatal() << "or the target file (mysql.conf) could not be written.";
-     }
--    actualFile.close();
--    globalFile.close();
--  } else {
--    akError() << "Unable to create MySQL server configuration file.";
--    akError() << "This means that either the default configuration file (mysql-global.conf) was not readable";
--    akFatal() << "or the target file (mysql.conf) could not be written.";
-   }
- 
-   // MySQL doesn't like world writeable config files (which makes sense), but
-@@ -276,6 +283,12 @@
-     }
-   }
- 
-+  // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate
-+  if ( confUpdate ) {
-+      QFile(dataDir + QDir::separator() + QString::fromLatin1( "ib_logfile0" )).remove();
-+      QFile(dataDir + QDir::separator() + QString::fromLatin1( "ib_logfile1" )).remove();
-+  }
-+
-   // synthesize the mysqld command
-   QStringList arguments;
-   arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir );
diff --git a/akonadi.spec b/akonadi.spec
index eca66fb..95f6270 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,12 +1,13 @@
+
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.1.1
-Release: 6%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
-Source0:  http://akonadi.omat.nl/akonadi-%{version}.tar.bz2
+Source0:  http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # shrink default initial db size a bit (approx 140mb->28mb)
@@ -14,8 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: akonadi-1.1.1-mysql_conf.patch
 
 ## upstream
-# http://websvn.kde.org/branches/akonadi/1.1/server/src/akonadi.cpp?r1=905029&r2=931467&view=patch
-Patch100: akonadi-1.1.1-startup-2.patch
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
@@ -33,7 +32,6 @@ Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
 Requires(hint): mysql-server
 
-Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -58,7 +56,6 @@ Requires: pkgconfig
 
 %patch1 -p1 -b .mysql_conf
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
-%patch100 -p3 -b .startup-2
 
 
 %build
@@ -85,13 +82,16 @@ touch -d %{mysql_conf_timestamp} $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-loc
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%posttrans
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-update-mime-database %{_datadir}/mime &> /dev/null || :
+/sbin/ldconfig ||:
+if [ $1 -eq 0 ] ; then
+  update-mime-database %{_datadir}/mime &> /dev/null ||:
+fi
 
 
 %files
@@ -118,6 +118,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Thu Apr 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.2-1
+- akonadi-1.1.2
+- optimize scriptlets a bit
+
 * Wed Feb 25 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.1-6
 - rev startup patch
 - BR: cmake >= 2.6.0
diff --git a/sources b/sources
index e14eac9..49557d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e98b42cec9ec4e60a2e3c096f1a3106  akonadi-1.1.1.tar.bz2
+5651b02358f7d2f1c0954dfd31feafb1  akonadi-1.1.2.tar.bz2