From: Jakub Bogusz Date: Sat, 23 May 2020 06:27:51 +0000 (+0200) Subject: - added nanomsg patch (adjust for .pc file rename in nanomsg 1.0.0+) X-Git-Tag: auto/th/openchange-2.3-51 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenchange.git;a=commitdiff_plain;h=b5f7e37;ds=sidebyside - added nanomsg patch (adjust for .pc file rename in nanomsg 1.0.0+) - release 51 (rebuild with samba 4.12.3) --- diff --git a/openchange-nanomsg.patch b/openchange-nanomsg.patch new file mode 100644 index 0000000..5b594ea --- /dev/null +++ b/openchange-nanomsg.patch @@ -0,0 +1,11 @@ +--- openchange-openchange-2.3-VULCAN/configure.ac.orig 2020-05-23 08:12:19.965123403 +0200 ++++ openchange-openchange-2.3-VULCAN/configure.ac 2020-05-23 08:16:46.680345149 +0200 +@@ -292,7 +292,7 @@ + dnl --------------------------------------------------------------------------- + dnl Check for nanomsg library (server notification) + dnl --------------------------------------------------------------------------- +-PKG_CHECK_MODULES(NANOMSG, libnanomsg, [], [AC_MSG_ERROR(Install nanomsg library >= 0.5)]) ++PKG_CHECK_MODULES(NANOMSG, nanomsg, [], [AC_MSG_ERROR(Install nanomsg library >= 0.5)]) + AC_SUBST(NANOMSG_CFLAGS) + AC_SUBST(NANO_LIBS) + diff --git a/openchange.spec b/openchange.spec index 00804b3..12eb98e 100644 --- a/openchange.spec +++ b/openchange.spec @@ -12,7 +12,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: 50 +Release: 51 License: GPL v3+ Group: Libraries #Source0Download: https://github.com/openchange/openchange/releases @@ -29,6 +29,7 @@ Patch7: %{name}-samba-4.10-macros.patch Patch8: %{name}-libical.patch Patch9: samba-4.11.patch Patch10: samba-4.12.patch +Patch11: %{name}-nanomsg.patch URL: https://github.com/openchange BuildRequires: QtCore-devel >= 4.3.0 BuildRequires: QtGui-devel >= 4.3.0 @@ -43,7 +44,7 @@ BuildRequires: libmemcached-devel >= 1.0.18 BuildRequires: libpcap-devel BuildRequires: libstdc++-devel BuildRequires: mysql-devel -BuildRequires: nanomsg-devel >= 0.5 +BuildRequires: nanomsg-devel >= 1.0.0 BuildRequires: perl-base BuildRequires: pkgconfig >= 1:0.20 BuildRequires: popt-devel @@ -225,6 +226,7 @@ Wtyczka Nagiosa do sprawdzania usług Exchange/OpenChange. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # no switch for verbose mode, enable manually :/ %{__sed} -i -e 's/^ @\(\$(\(PIDL\|CC\|CXX\|MOC\)\)/ \1/' Makefile