rpms/akonadi/devel akonadi-1.3.80-version.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 akonadi.spec, 1.61, 1.62 sources, 1.22, 1.23

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15465

Modified Files:
	.cvsignore akonadi.spec sources 
Added Files:
	akonadi-1.3.80-version.patch 
Log Message:
* Wed May 26 2010 Rex Dieter <rdieter at fedoraproject.org> 1.3.80-1
- akonadi-1.3.80


akonadi-1.3.80-version.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE akonadi-1.3.80-version.patch ---
diff -up akonadi-1.3.80/CMakeLists.txt.version akonadi-1.3.80/CMakeLists.txt
--- akonadi-1.3.80/CMakeLists.txt.version	2010-05-26 10:27:00.000000000 -0500
+++ akonadi-1.3.80/CMakeLists.txt	2010-05-26 13:39:03.274452753 -0500
@@ -35,7 +35,7 @@ include(MacroWriteBasicCMakeVersionFile)
 
 set(AKONADI_VERSION_MAJOR "1")
 set(AKONADI_VERSION_MINOR "3")
-set(AKONADI_VERSION_PATCH "60")
+set(AKONADI_VERSION_PATCH "80")
 set(AKONADI_VERSION "${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${AKONADI_VERSION_PATCH}")
 
 # If Subversion is installed, and a '.svn' directory is found,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	23 May 2010 22:37:17 -0000	1.21
+++ .cvsignore	26 May 2010 19:20:12 -0000	1.22
@@ -1 +1 @@
-akonadi-20100523svn.tar.bz2
+akonadi-1.3.80.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- akonadi.spec	23 May 2010 23:06:29 -0000	1.61
+++ akonadi.spec	26 May 2010 19:20:13 -0000	1.62
@@ -1,22 +1,23 @@
 
-%define snap 20100523
-
 %if 0%{?fedora} > 13
-%define sqlite 1
+#define sqlite 1
 %endif
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.3.60
-Release: 1.%{snap}%{?dist}
+Version: 1.3.80
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
-# Official release
-#Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
+%if 0%{?snap}
 Source0: akonadi-%{snap}svn.tar.bz2
 Source1: akonadi-svn_checkout.sh
+%else
+# Official release
+Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # shrink default initial db size a bit (approx 140mb->28mb)
@@ -24,7 +25,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1: akonadi-mysql_conf.patch
 
 ## upstream patches
-# backport from trunk/
+Patch100: akonadi-1.3.80-version.patch
+
+## backport from trunk/
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
@@ -35,8 +38,11 @@ BuildRequires: mysql-server
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
 BuildRequires: boost-devel
-%{?sqlite:BuildRequires: sqlite-devel >= 2.6.23}
 BuildRequires: soprano-devel
+%if 0%{?sqlite}
+BuildRequires: sqlite-devel >= 3.6.23
+%endif
+
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 # when/if akonadi grows support for other backends, consider splitting
@@ -69,6 +75,8 @@ Requires: pkgconfig
 %patch1 -p1 -b .mysql_conf
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
 
+%patch100 -p1 -b .version
+
 
 %build
 mkdir -p %{_target_platform}
@@ -91,6 +99,7 @@ touch -d %{mysql_conf_timestamp} %{build
 
 
 %check
+make test -C %{_target_platform}
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion akonadi)" = "%{version}"
 
@@ -126,7 +135,9 @@ fi
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service
 %{_datadir}/mime/packages/akonadi-mime.xml
 %{_datadir}/akonadi/
-%{?sqlite:%{_qt4_plugindir}/sqldrivers/libqsqlite3.so}
+%if 0%{?sqlite}
+%{_qt4_plugindir}/sqldrivers/libqsqlite3.so
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -137,6 +148,9 @@ fi
 
 
 %changelog
+* Wed May 26 2010 Rex Dieter <rdieter at fedoraproject.org> 1.3.80-1
+- akonadi-1.3.80
+
 * Sun May 23 2010 Rex Dieter <rdieter at fedoraproject.org> 1.3.60-1.20100523
 - akonadi-1.3.60 (20100523 snapshot)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	23 May 2010 22:37:18 -0000	1.22
+++ sources	26 May 2010 19:20:13 -0000	1.23
@@ -1 +1 @@
-cc4ec9f710cff374120ec36bdad9604b  akonadi-20100523svn.tar.bz2
+446389f26c8c5e40791060c8d7ac9697  akonadi-1.3.80.tar.bz2