diff --git a/akonadi-1.9.0-boost153.patch b/akonadi-1.9.0-boost153.patch deleted file mode 100644 index ee11748..0000000 --- a/akonadi-1.9.0-boost153.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up akonadi-1.9.0/shared/akapplication.h.boost153 akonadi-1.9.0/shared/akapplication.h ---- akonadi-1.9.0/shared/akapplication.h.boost153 2012-12-23 04:11:44.000000000 -0600 -+++ akonadi-1.9.0/shared/akapplication.h 2013-02-10 15:19:42.115689459 -0600 -@@ -22,9 +22,11 @@ - - #include - -+#ifndef Q_MOC_RUN - #ifndef _WIN32_WCE - #include - #endif -+#endif - - class QCoreApplication; - class QApplication; diff --git a/akonadi.spec b/akonadi.spec index 64cf4c7..ee62d94 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -5,7 +5,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.9.0 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -22,8 +22,6 @@ Source0: http://download.kde.org/stable/akonadi/src/akonadi-%{version}.tar.bz2 Source10: akonadiserverrc.mysql ## upstreamable patches -# hack around boost/automoc FTBFS, see also https://bugreports.qt-project.org/browse/QTBUG-22829 -Patch50: akonadi-1.9.0-boost153.patch ## upstream patches Patch101: 0001-disable-the-cache-for-the-SQlite-backend.patch @@ -83,7 +81,6 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf %prep %setup -q -n akonadi-%{version} -%patch50 -p1 -b .boost153 %patch101 -p1 -b .0001 %patch102 -p1 -b .0002 %patch103 -p1 -b .0003 @@ -204,6 +201,9 @@ fi %changelog +* Mon Feb 11 2013 Rex Dieter 1.9.0-5 +- drop boost patch, qt/moc has workaround now + * Sun Feb 10 2013 Denis Arnaud - 1.9.0-4 - Rebuild for Boost-1.53.0