X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openchange.spec;h=bcc3f1f05d8b14bf93ba9855210308cc273eb3c2;hb=6b063ab9b6cd76576373697bbad7180b9d077468;hp=83f4714c5163e968f8d802363c156840e6fb91cc;hpb=29dcaaf88c51662440d499f2a1cf0a5776b2fa86;p=packages%2Fopenchange.git

diff --git a/openchange.spec b/openchange.spec
index 83f4714..bcc3f1f 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:	47
+Release:	61
 License:	GPL v3+
 Group:		Libraries
 #Source0Download: https://github.com/openchange/openchange/releases
@@ -28,6 +28,9 @@ Patch6:		%{name}-covscan.patch
 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
+Patch12:	samba-4.15.patch
 URL:		https://github.com/openchange
 BuildRequires:	QtCore-devel >= 4.3.0
 BuildRequires:	QtGui-devel >= 4.3.0
@@ -42,7 +45,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
@@ -50,7 +53,8 @@ BuildRequires:	popt-devel
 BuildRequires:	python-devel >= 1:2.7
 BuildRequires:	python-samba >= 4.2.2
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.752
 # with DCERCP multiplex and pending call support (upstream 4.1.18+ or 4.2.2+)
 # samba-4.10-macros patch requires samba-pidl 4.10+
 BuildRequires:	samba-devel >= 4.10
@@ -176,9 +180,7 @@ Pliki nagłówkowe interfejsu Qt do biblioteki OpenChange MAPI.
 Summary:	API documentation for OpenChange libraries
 Summary(pl.UTF-8):	Dokumentacja API bibliotek OpenChange
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description apidocs
 API documentation for OpenChange libraries.
@@ -223,6 +225,9 @@ Wtyczka Nagiosa do sprawdzania usług Exchange/OpenChange.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 # no switch for verbose mode, enable manually :/
 %{__sed} -i -e 's/^	@\(\$(\(PIDL\|CC\|CXX\|MOC\)\)/	\1/' Makefile
@@ -231,6 +236,8 @@ Wtyczka Nagiosa do sprawdzania usług Exchange/OpenChange.
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
+# instead of calling automake (there is no Makefile.am)
+cp -f /usr/share/automake/{compile,missing} .
 %configure \
 	--datadir=%{_datadir}/openchange \
 	--enable-openchange-qt4 \