rpms/akonadi/devel akonadi-1.1.85-AKONADI_VERSION.patch, NONE, 1.1 akonadi.spec, 1.37, 1.38

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31962

Modified Files:
	akonadi.spec 
Added Files:
	akonadi-1.1.85-AKONADI_VERSION.patch 
Log Message:
* Tue May 26 2009 Rex Dieter <rdieter at fedoraproject.org> 1.1.85-3
- akonadi.pc.cmake: s/AKONADI_LIB_VERSION_STRING/AKONADI_VERSION_STRING/


akonadi-1.1.85-AKONADI_VERSION.patch:

--- NEW FILE akonadi-1.1.85-AKONADI_VERSION.patch ---
diff -up akonadi-1.1.85/akonadi.pc.cmake.AKONADI_VERSION akonadi-1.1.85/akonadi.pc.cmake
--- akonadi-1.1.85/akonadi.pc.cmake.AKONADI_VERSION	2009-05-05 16:58:18.000000000 -0500
+++ akonadi-1.1.85/akonadi.pc.cmake	2009-05-26 09:16:40.343944982 -0500
@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_PREFIX@/includ
 
 Name: Akonadi
 Description: Akonadi server and infrastructure needed to build client libraries and applications
-Version: @AKONADI_LIB_VERSION_STRING@
+Version: @AKONADI_VERSION_STRING@
 Requires: QtCore QtSql QtDBus
 Libs: -L${libdir} -lakonadiprotocolinternals
 Cflags: -I${includedir}


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- akonadi.spec	12 May 2009 11:32:28 -0000	1.37
+++ akonadi.spec	26 May 2009 14:24:38 -0000	1.38
@@ -2,7 +2,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.1.85
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 %define mysql_conf_timestamp 20090220
 Patch1: akonadi-1.1.1-mysql_conf.patch
 
+## upstream(able) patches
+Patch100: akonadi-1.1.85-AKONADI_VERSION.patch
+
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
 BuildRequires: automoc4
@@ -29,7 +32,7 @@ BuildRequires: soprano-devel
 # these similar to how phonon is done currently.
 Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
-Requires(hint): mysql-server
+Requires: mysql-server
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -55,6 +58,8 @@ Requires: pkgconfig
 %patch1 -p1 -b .mysql_conf
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
 
+%patch100 -p1 -b .AKONADI_VERSION
+
 
 %build
 
@@ -117,6 +122,9 @@ fi
 
 
 %changelog
+* Tue May 26 2009 Rex Dieter <rdieter at fedoraproject.org> 1.1.85-3
+- akonadi.pc.cmake: s/AKONADI_LIB_VERSION_STRING/AKONADI_VERSION_STRING/
+
 * Tue May 12 2009 Than Ngo <than at redhat.com> 1.1.85-2
 - fix rpm file list