packages: akonadi/akonadi-mysqlpath.patch, akonadi/akonadi.spec - rel 2; pr...

arekm arekm at pld-linux.org
Thu Feb 4 20:28:13 CET 2010


Author: arekm                        Date: Thu Feb  4 19:28:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; proper mysqlpath

---- Files affected:
packages/akonadi:
   akonadi-mysqlpath.patch (1.1 -> 1.2) , akonadi.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: packages/akonadi/akonadi-mysqlpath.patch
diff -u packages/akonadi/akonadi-mysqlpath.patch:1.1 packages/akonadi/akonadi-mysqlpath.patch:1.2
--- packages/akonadi/akonadi-mysqlpath.patch:1.1	Tue Aug 11 13:25:32 2009
+++ packages/akonadi/akonadi-mysqlpath.patch	Thu Feb  4 20:28:07 2010
@@ -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~

================================================================
Index: packages/akonadi/akonadi.spec
diff -u packages/akonadi/akonadi.spec:1.41 packages/akonadi/akonadi.spec:1.42
--- packages/akonadi/akonadi.spec:1.41	Mon Feb  1 00:20:05 2010
+++ packages/akonadi/akonadi.spec	Thu Feb  4 20:28:07 2010
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
 %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
@@ -150,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2010/02/04 19:28:07  arekm
+- rel 2; proper mysqlpath
+
 Revision 1.41  2010/01/31 23:20:05  shadzik
 - 1.3.0 merged from DEVEL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/akonadi/akonadi-mysqlpath.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/akonadi/akonadi.spec?r1=1.41&r2=1.42&f=u



More information about the pld-cvs-commit mailing list