- rel 2; drop mysqlpath patch (made no sense)

Changed files:
    akonadi-mysqlpath.patch -> 1.3
    akonadi.spec -> 1.45

diff --git a/akonadi-mysqlpath.patch b/akonadi-mysqlpath.patch
deleted file mode 100644 (file)
index c420f5d..0000000
--- a/akonadi-mysqlpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
- StartServer=true
--ServerPath=/usr/sbin/mysqld
-+ServerPath=/sbin/mysqld
- 
- [QSQLITE]
- Name=/home/foo/.local/share/akonadi/akonadi.db
-Tylko w akonadi-1.2.61-svn1032993.new/server/src/storage: datastore.h~

diff --git a/akonadi.spec b/akonadi.spec
index 7596017091b84c4614c1eaee9ce42e7b9ec42953..1bbc453d2bf67b78395701703814b91a102ce650 100644 (file)
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -4,14 +4,13 @@ Summary:      Akonadi - The PIM Storage Service
 Summary(pl.UTF-8):     Akonadi - usługa przechowywania danych dla aplikacji PIM
 Name:          akonadi
 Version:       1.3.1
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://download.akonadi-project.org/%{name}-%{version}.tar.bz2
 # Source0-md5: e6eef3ed5c28d55f4b6530544e379413
 # svn co svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/
 #Source0:      %{name}-%{version}-%{snap}.tar.bz2
-Patch0:                %{name}-mysqlpath.patch
 URL:           http://pim.kde.org/akonadi/
 BuildRequires: QtCore-devel >= %{qtbrver}
 BuildRequires: QtDBus-devel >= %{qtbrver}
@@ -79,7 +78,6 @@ Biblioteki Akonadi.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build