[libkolab] Fix the build (wrong include, patch1)
Jeroen van Meeuwen
kanarip at fedoraproject.org
Wed Aug 15 16:23:54 UTC 2012
commit 9328064398f0ee122fab48cdc6c6dd610e37b06d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Wed Aug 15 17:21:53 2012 +0100
Fix the build (wrong include, patch1)
...errorhandler.h-kolabformat-errorhandler.h.patch | 39 ++++++++++++++++++++
libkolab.spec | 8 +++-
2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch b/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
new file mode 100644
index 0000000..4edb9da
--- /dev/null
+++ b/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
@@ -0,0 +1,39 @@
+From 8886295189491151dbd3590649aaf43e15321dc6 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen at kolabsys.com>
+Date: Wed, 15 Aug 2012 17:20:12 +0100
+Subject: [PATCH] Fix kolab/errorhandler.h > kolabformat/errorhandler.h
+
+---
+ tests/kolabobjecttest.cpp | 2 +-
+ tests/upgradetest.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/kolabobjecttest.cpp b/tests/kolabobjecttest.cpp
+index 19d7de7..9f44f2a 100644
+--- a/tests/kolabobjecttest.cpp
++++ b/tests/kolabobjecttest.cpp
+@@ -21,7 +21,7 @@
+
+ #include "kolabformat/kolabobject.h"
+ #include <kdebug.h>
+-#include <kolab/errorhandler.h>
++#include <kolabformat/errorhandler.h>
+
+ void KolabObjectTest::preserveLatin1()
+ {
+diff --git a/tests/upgradetest.cpp b/tests/upgradetest.cpp
+index ee376be..0e943ac 100644
+--- a/tests/upgradetest.cpp
++++ b/tests/upgradetest.cpp
+@@ -21,7 +21,7 @@
+ #include <QTest>
+ #include <kolabcontainers.h>
+ #include <kolabformat.h>
+-#include <kolab/errorhandler.h>
++#include <kolabformat/errorhandler.h>
+
+ #include "testutils.h"
+ #include "kolabformat/kolabobject.h"
+--
+1.7.11.2
+
diff --git a/libkolab.spec b/libkolab.spec
index e7ca6b7..8cf4d29 100644
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -10,7 +10,7 @@
Name: libkolab
Version: 0.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kolab Object Handling Library
License: LGPLv3+
@@ -18,6 +18,8 @@ URL: http://git.kolab.org/libkolab
Source0: http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
+Patch1: 0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
+
%if 0%{?rhel} > 6 || 0%{?fedora} > 17
BuildRequires: kdepimlibs-devel >= 4.9
%else
@@ -76,6 +78,7 @@ Python bindings for libkolab
%prep
%setup -q
+%patch1 -p1
%build
rm -rf build
@@ -156,7 +159,8 @@ rm -rf %{buildroot}
%{python_sitearch}/kolab/shared.py*
%changelog
-* Wed Aug 15 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3.1-2
+* Wed Aug 15 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3.1-3
+- Fix build (patch1)
- Merge back with Fedora,
- Rebuilt for boost (Christoph Wickert, 0.3-10)
More information about the scm-commits
mailing list