From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 1 May 2016 15:18:32 +0000 (+0200)
Subject: - fix building with new flex
X-Git-Tag: auto/th/openchange-2.3-6
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenchange.git;a=commitdiff_plain;h=2407fd75283453c154a742b6a895f86267c2a59a

- fix building with new flex
- rel 6
---

diff --git a/flex2.6.patch b/flex2.6.patch
new file mode 100644
index 0000000..fb1fb9d
--- /dev/null
+++ b/flex2.6.patch
@@ -0,0 +1,10 @@
+--- openchange-openchange-2.3-VULCAN/libocpf/lex.l~	2015-05-16 17:22:04.000000000 +0200
++++ openchange-openchange-2.3-VULCAN/libocpf/lex.l	2016-05-01 17:15:37.905107868 +0200
+@@ -29,7 +29,6 @@
+ #include "libocpf/lex.h"
+ 
+ #define	YY_EXTRA_TYPE	struct ocpf_context *
+-#define	YY_NO_UNPUT
+ 
+ static void unterminated(struct ocpf_context *, const char *, unsigned int);
+ 
diff --git a/openchange.spec b/openchange.spec
index e83e0ec..7ab0348 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -6,7 +6,7 @@ Summary:	OpenChange - portable implementation of MS Exchange Server and Exchange
 Summary(pl.UTF-8):	OpenChange - przenośna implementacja serwera oraz protokołów MS Exchange
 Name:		openchange
 Version:	2.3
-Release:	5
+Release:	6
 License:	GPL v3+
 Group:		Libraries
 %define	cname	VULCAN
@@ -14,6 +14,7 @@ Source0:	https://github.com/openchange/openchange/archive/%{name}-%{version}-%{c
 # Source0-md5:	96c13c78c2bcbd7040f7848746284b9f
 Patch0:		%{name}-samba-private.patch
 Patch1:		%{name}-link.patch
+Patch2:		flex2.6.patch
 URL:		http://www.openchange.org/
 BuildRequires:	QtCore-devel >= 4.3.0
 BuildRequires:	QtGui-devel >= 4.3.0
@@ -193,6 +194,7 @@ Wtyczka Nagiosa do sprawdzania usług Exchange/OpenChange.
 %setup -q -n %{name}-%{name}-%{version}-%{cname}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # no switch for verbose mode, enable manually :/
 %{__sed} -i -e 's/^	@\(\$(\(PIDL\|CC\|CXX\|MOC\)\)/	\1/' Makefile