rpms/akonadi/devel akonadi.spec, 1.5, 1.6 akonadi-restore-builtin-automoc4.patch, 1.2, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2900/devel

Modified Files:
	akonadi.spec 
Removed Files:
	akonadi-restore-builtin-automoc4.patch 
Log Message:
* Tue Jun  3 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.81.0-0.2.20080526svn812787
- BR automoc, drop automoc hack


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- akonadi.spec	26 May 2008 15:58:06 -0000	1.5
+++ akonadi.spec	3 Jun 2008 06:26:26 -0000	1.6
@@ -3,15 +3,13 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 0.81.0
-Release: 0.1.20080526svn%{revision}%{?dist}
+Release: 0.2.20080526svn%{revision}%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://pim.kde.org/akonadi/
 # checked out from svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/
 Source0: akonadi-%{revision}.tar.bz2
-# temporary hack until we have automoc4 packaged separately
-Patch0:  akonadi-restore-builtin-automoc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
@@ -19,6 +17,7 @@
 
 BuildRequires: cmake
 BuildRequires: qt4-devel >= 4.4
+BuildRequires: automoc
 BuildRequires: mysql-devel
 # for xsltproc
 BuildRequires: libxslt
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q -n %{name}-%{revision}
-%patch0 -p0 -b .restore-automoc4
 
 %build
 %cmake . -DCONFIG_INSTALL_DIR=%{_sysconfdir}
@@ -82,6 +80,9 @@
 %{_libdir}/libakonadi*.so
 
 %changelog
+* Tue Jun  3 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.81.0-0.2.20080526svn812787
+- BR automoc, drop automoc hack
+
 * Mon May 26 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.81.0-0.1.20080526svn812787
 - update to revision 812787 from KDE SVN (to match KDE 4.1 Beta 1)
 - restore builtin automoc4 for now


--- akonadi-restore-builtin-automoc4.patch DELETED ---