- rel 2; proper mysqlpath

Changed files:
    akonadi-mysqlpath.patch -> 1.2
    akonadi.spec -> 1.42

diff --git a/akonadi-mysqlpath.patch b/akonadi-mysqlpath.patch
index f022603a7416fd9ab987ded8f9ae93f9fd97009f..c420f5db3042fa2a4b0b4a7ac965192d1f0f69be 100644 (file)
--- a/akonadi-mysqlpath.patch
+++ b/akonadi-mysqlpath.patch
@@ -1,5 +1,17 @@
---- server/src/storage/datastore.h.old 2009-08-11 13:21:23.575567291 +0200
-+++ server/src/storage/datastore.h     2009-08-11 13:21:45.620417194 +0200
+diff -ur akonadi-1.2.61-svn1032993/server/CMakeLists.txt akonadi-1.2.61-svn1032993.new/server/CMakeLists.txt
+--- akonadi-1.2.61-svn1032993/server/CMakeLists.txt    2009-10-09 09:14:29.953090764 +0200
++++ akonadi-1.2.61-svn1032993.new/server/CMakeLists.txt        2009-10-09 09:20:01.097070759 +0200
+@@ -1,5 +1,5 @@
+ 
+-find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin )
++find_program( MYSQLD_EXECUTABLE mysqld /sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin )
+ if( MYSQLD_EXECUTABLE)
+    message( STATUS "MySQL Server found." )
+ else ( MYSQLD_EXECUTABLE )
+Tylko w akonadi-1.2.61-svn1032993.new/server: CMakeLists.txt~
+diff -ur akonadi-1.2.61-svn1032993/server/src/storage/datastore.h akonadi-1.2.61-svn1032993.new/server/src/storage/datastore.h
+--- akonadi-1.2.61-svn1032993/server/src/storage/datastore.h   2009-10-09 09:14:29.819737606 +0200
++++ akonadi-1.2.61-svn1032993.new/server/src/storage/datastore.h       2009-10-09 09:19:35.436665423 +0200
 @@ -60,7 +60,7 @@
  Password=*****
  #Options=UNIX_SOCKET=/home/foo/.local/share/akonadi/db_misc/mysql.socket
@@ -9,12 +21,4 @@
  
  [QSQLITE]
  Name=/home/foo/.local/share/akonadi/akonadi.db
---- server/CMakeLists.txt.old  2009-08-11 13:18:41.682055997 +0200
-+++ server/CMakeLists.txt      2009-08-11 13:19:22.258718400 +0200
-@@ -1,5 +1,5 @@
- 
--find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec )
-+find_program( MYSQLD_EXECUTABLE mysqld /sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec )
- if( MYSQLD_EXECUTABLE)
-    message( STATUS "MySQL Server found." )
- else ( MYSQLD_EXECUTABLE )
+Tylko w akonadi-1.2.61-svn1032993.new/server/src/storage: datastore.h~

diff --git a/akonadi.spec b/akonadi.spec
index efbaa4f7c4152d8ad10b44fe5085f75eb612aff6..5f699ff98c2d4204480cf35fa00537dbd3f173ec 100644 (file)
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,10 +1,10 @@
 %define                snap            svn1057960
-%define                qtbrver         4.6.0
+%define                qtbrver         4.6.1
 Summary:       Akonadi - The PIM Storage Service
 Summary(pl.UTF-8):     Akonadi - usługa przechowywania danych dla aplikacji PIM
 Name:          akonadi
 Version:       1.3.0
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://download.akonadi-project.org/%{name}-%{version}.tar.bz2