X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenchange.git;a=blobdiff_plain;f=openchange.spec;h=0616b4de4b9aaf4d57787faea20c15f6dac7b808;hp=4caf83cae8997abe2368752f9687644f8ad7a47e;hb=442a8170a132c273f053499889a10c5cde494dfb;hpb=cc90af90056fe116b59a70c2a62e58b363cf54f4

diff --git a/openchange.spec b/openchange.spec
index 4caf83c..0616b4d 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:	1
+Release:	3
 License:	GPL v3+
 Group:		Libraries
 %define	cname	VULCAN
@@ -33,10 +33,11 @@ BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.20
 BuildRequires:	popt-devel
 BuildRequires:	python-devel >= 1:2.7
+BuildRequires:	python-samba >= 4.2.2
 BuildRequires:	rpmbuild(macros) >= 1.219
-# with DCERCP multiplex and pending call support (upstream 4.1.18+ or 4.2.>1)
-BuildRequires:	samba-devel >= 4.2.1
-BuildRequires:	samba-pidl >= 4.2.1
+# with DCERCP multiplex and pending call support (upstream 4.1.18+ or 4.2.2+)
+BuildRequires:	samba-devel >= 4.2.2
+BuildRequires:	samba-pidl >= 4.2.2
 BuildRequires:	sed >= 4.0
 BuildRequires:	subunit-devel
 BuildRequires:	talloc-devel
@@ -46,9 +47,6 @@ Requires:	%{name}-libs = %{version}-%{release}
 Requires:	python-openchange = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# libraries use symbols also from samba libs pulled indirectly, from outside %{_libdir}
-#define		filterout_ld	-Wl,--no-copy-dt-needed-entries
-
 %description
 OpenChange is a portable Open Source implementation of Microsoft
 Exchange server and Exchange protocols. It provides a complete
@@ -90,6 +88,11 @@ Summary:	Header files for OpenChange libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek OpenChange
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	ldb-devel
+Requires:	samba-devel >= 4.2.2
+Requires:	talloc-devel
+Requires:	tevent-devel
+Requires:	zlib-devel
 
 %description devel
 Header files for OpenChange libraries.
@@ -101,6 +104,7 @@ Pliki nagłówkowe bibliotek OpenChange.
 Summary:	C++ interface to OpenChange MAPI library
 Summary(pl.UTF-8):	Interfejs C++ do biblioteki OpenChange MAPI
 Group:		Libraries
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description c++
 C++ interface to OpenChange MAPI library.
@@ -113,6 +117,8 @@ Summary:	Header files of C++ interface to OpenChange MAPI library
 Summary(pl.UTF-8):	Pliki nagłówkowe interfejsu C++ do biblioteki OpenChange MAPI
 Group:		Development/Libraries
 Requires:	%{name}-c++ = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	libstdc++-devel
 
 %description c++-devel
 Header files of C++ interface to OpenChange MAPI library.
@@ -124,6 +130,9 @@ Pliki nagłówkowe interfejsu C++ do biblioteki OpenChange MAPI.
 Summary:	Qt interface to OpenChange MAPI library
 Summary(pl.UTF-8):	Interfejs Qt do biblioteki OpenChange MAPI
 Group:		Libraries
+Requires:	%{name}-c++ = %{version}-%{release}
+Requires:	QtCore >= 4.3.0
+Requires:	QtGui >= 4.3.0
 
 %description qt
 Qt interface to OpenChange MAPI library.
@@ -136,6 +145,7 @@ Summary:	Header files of Qt interface to OpenChange MAPI library
 Summary(pl.UTF-8):	Pliki nagłówkowe interfejsu Qt do biblioteki OpenChange MAPI
 Group:		Development/Libraries
 Requires:	%{name}-qt = %{version}-%{release}
+Requires:	QtGui-devel >= 4.3.0
 
 %description qt-devel
 Header files of Qt interface to OpenChange MAPI library.
@@ -234,8 +244,14 @@ cp -a libqtmapi.so.*.* libqtmapi.so $RPM_BUILD_ROOT%{_libdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
+%post	c++ -p /sbin/ldconfig
+%postun	c++ -p /sbin/ldconfig
+
+%post	qt -p /sbin/ldconfig
+%postun	qt -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -295,8 +311,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libmapi.so.0
 %attr(755,root,root) %{_libdir}/libmapiadmin.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmapiadmin.so.0
-%attr(755,root,root) %{_libdir}/libmapipp.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmapipp.so.0
 %attr(755,root,root) %{_libdir}/libmapiproxy.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmapiproxy.so.0
 %attr(755,root,root) %{_libdir}/libmapiserver.so.*.*
@@ -310,27 +324,35 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmapi.so
 %attr(755,root,root) %{_libdir}/libmapiadmin.so
-%attr(755,root,root) %{_libdir}/libmapipp.so
 %attr(755,root,root) %{_libdir}/libmapiproxy.so
 %attr(755,root,root) %{_libdir}/libmapiserver.so
 %attr(755,root,root) %{_libdir}/libmapistore.so
 %attr(755,root,root) %{_libdir}/libocpf.so
 %{_includedir}/gen_ndr
 %{_includedir}/libmapi
-%{_includedir}/libmapi++
 %{_includedir}/libmapiadmin
 %{_includedir}/libocpf
 %{_includedir}/mapistore
 %{_includedir}/libmapiproxy.h
 %{_includedir}/libmapiserver.h
 %{_pkgconfigdir}/libmapi.pc
-%{_pkgconfigdir}/libmapi++.pc
 %{_pkgconfigdir}/libmapiadmin.pc
 %{_pkgconfigdir}/libmapiproxy.pc
 %{_pkgconfigdir}/libmapiserver.pc
 %{_pkgconfigdir}/libmapistore.pc
 %{_pkgconfigdir}/libocpf.pc
 
+%files c++
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmapipp.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmapipp.so.0
+
+%files c++-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmapipp.so
+%{_includedir}/libmapi++
+%{_pkgconfigdir}/libmapi++.pc
+
 %files qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libqtmapi.so.*.*