- fix building with new flex

- rel 6

diff --git a/flex2.6.patch b/flex2.6.patch
new file mode 100644 (file)
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 e83e0ecbf2b00a3e216353b4c8044a9c54081e82..7ab0348e07fc81010c3a34dc9e83cf225ccf7708 100644 (file)
--- 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
 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
 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
 # 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
 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
 %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
 
 # no switch for verbose mode, enable manually :/
 %{__sed} -i -e 's/^    @\(\$(\(PIDL\|CC\|CXX\|MOC\)\)/ \1/' Makefile