diff --git a/.cvsignore b/.cvsignore index 8c0fbe3..619728b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ akonadi-1.1.85.tar.bz2 +akonadi-1.1.90.tar.bz2 diff --git a/akonadi-1.1.85-AKONADI_VERSION.patch b/akonadi-1.1.85-AKONADI_VERSION.patch deleted file mode 100644 index 02a2b4c..0000000 --- a/akonadi-1.1.85-AKONADI_VERSION.patch +++ /dev/null @@ -1,12 +0,0 @@ -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} diff --git a/akonadi.spec b/akonadi.spec index 153c412..9c6e09e 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -1,8 +1,8 @@ Summary: PIM Storage Service Name: akonadi -Version: 1.1.85 -Release: 3%{?dist} +Version: 1.1.90 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -14,8 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define mysql_conf_timestamp 20090220 Patch1: akonadi-1.1.1-mysql_conf.patch -## upstream(able) patches -Patch100: akonadi-1.1.85-AKONADI_VERSION.patch +## upstream patches BuildRequires: cmake >= 2.6.0 BuildRequires: qt4-devel >= 4.4 @@ -58,8 +57,6 @@ Requires: pkgconfig %patch1 -p1 -b .mysql_conf touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf -%patch100 -p1 -b .AKONADI_VERSION - %build @@ -118,10 +115,13 @@ fi %{_includedir}/akonadi/ %{_libdir}/pkgconfig/akonadi.pc %{_libdir}/libakonadi*.so -%{_libdir}/cmake/Akonadi-%{version}/ +%{_libdir}/cmake/Akonadi/ %changelog +* Wed Jun 03 2009 Rex Dieter 1.1.90-1 +- akonadi-1.1.90 + * Tue May 26 2009 Rex Dieter 1.1.85-3 - akonadi.pc.cmake: s/AKONADI_LIB_VERSION_STRING/AKONADI_VERSION_STRING/ diff --git a/sources b/sources index 019994f..f6c1cb0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ d85ca08d8a0f9726177778c72b7e4c6d akonadi-1.1.85.tar.bz2 +118d716bd2dc6185b4c7196eefe85c22 akonadi-1.1.90.tar.bz2