rpms/akonadi/devel .cvsignore, 1.16, 1.17 akonadi.spec, 1.48, 1.49 sources, 1.17, 1.18

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.80-1
- Akonadi 1.2.80
- restore mysql deps



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	24 Nov 2009 16:16:20 -0000	1.16
+++ .cvsignore	7 Dec 2009 17:03:42 -0000	1.17
@@ -1 +1 @@
-akonadi-1.2.61svn1052216.tar.bz2
+akonadi-1.2.80.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- akonadi.spec	24 Nov 2009 16:16:20 -0000	1.48
+++ akonadi.spec	7 Dec 2009 17:03:42 -0000	1.49
@@ -1,19 +1,14 @@
-%define alphatag svn1052216
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.2.61
-Release: 0.1.%{alphatag}%{?dist}
+Version: 1.2.80
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
-# Snapshot created with:
-# svn export -r 1052216 svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi akonadi-1.2.61svn1052216
-# tar cjf akonadi-1.2.61svn1052216.tar.bz2 akonadi-1.2.61svn1052216
-Source0: akonadi-%{version}%{?alphatag}.tar.bz2
 # Official release
-#Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
+Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # shrink default initial db size a bit (approx 140mb->28mb)
@@ -25,8 +20,8 @@ Patch1: akonadi-1.1.1-mysql_conf.patch
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
 BuildRequires: automoc4
-#BuildRequires: mysql-devel
-#BuildRequires: mysql-server
+BuildRequires: mysql-devel
+BuildRequires: mysql-server
 # for xsltproc
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
@@ -35,9 +30,9 @@ BuildRequires: soprano-devel
 
 # when/if akonadi grows support for other backends, consider splitting
 # these similar to how phonon is done currently.
-#Requires: qt4-mysql
+Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
-#Requires: mysql-server
+Requires: mysql-server
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -125,6 +120,10 @@ fi
 
 
 %changelog
+* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.80-1
+- Akonadi 1.2.80
+- restore mysql deps
+
 * Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 1.2.61-0.1.svn1052261
 - Update to SVN snapshot of 1.2.61
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	24 Nov 2009 16:16:20 -0000	1.17
+++ sources	7 Dec 2009 17:03:42 -0000	1.18
@@ -1 +1 @@
-5a2b63aad04954991593c0e7fa8aeeb9  akonadi-1.2.61svn1052216.tar.bz2
+86efecca13035df77d2da534cbd0074e  akonadi-1.2.80.tar.bz2