From 158c663fa29f6fd79cb5e130a3dee7e61495c814 Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Wed, 22 Mar 2017 19:51:24 +0100 Subject: [PATCH] Update to 3.24.0 - build system has been switched to cmake - removed -devel subpackage and obsolete -link patch --- evolution-ews-link.patch | 10 ------- evolution-ews.spec | 57 +++++++++++----------------------------- 2 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 evolution-ews-link.patch diff --git a/evolution-ews-link.patch b/evolution-ews-link.patch deleted file mode 100644 index 25ad6a3..0000000 --- a/evolution-ews-link.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- evolution-ews-3.22.0/src/server/Makefile.am.linking 2016-10-06 23:36:40.776191048 +0200 -+++ evolution-ews-3.22.0/src/server/Makefile.am 2016-10-06 23:36:53.656420458 +0200 -@@ -69,6 +69,7 @@ libeews_1_2_la_LIBADD = \ - $(LIBECAL_LIBS) \ - $(LIBICAL_LIBS) \ - $(LIBEDATASERVER_LIBS) \ -+ $(CAMEL_LIBS) \ - $(SOCKET_LIBS) \ - $(NULL) - diff --git a/evolution-ews.spec b/evolution-ews.spec index c715323..ffd1e91 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -1,21 +1,19 @@ Summary: Evolution extension for Exchange Web Services Summary(pl.UTF-8): Rozszerzenie Evolution dla Exchange Web Services Name: evolution-ews -Version: 3.22.6 +Version: 3.24.0 Release: 1 License: LGPL v2+ Group: X11/Applications/Mail -Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-ews/3.22/%{name}-%{version}.tar.xz -# Source0-md5: a4f5fbce7c327bd12149a1db35fae7fb -Patch0: %{name}-link.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-ews/3.24/%{name}-%{version}.tar.xz +# Source0-md5: f6be8655dc4b63248e993967e18b15cf URL: http://projects.gnome.org/evolution/ -BuildRequires: autoconf >= 2.58 -BuildRequires: automake >= 1:1.9 +BuildRequires: cmake >= 3.1 BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: evolution-devel >= %{version} BuildRequires: gettext-tools -BuildRequires: glib2-devel >= 1:2.40.0 -BuildRequires: gtk+3-devel >= 3.0.0 +BuildRequires: glib2-devel >= 1:2.46.0 +BuildRequires: gtk+3-devel >= 3.10.0 BuildRequires: gtk-doc >= 1.9 BuildRequires: intltool >= 0.40.0 BuildRequires: libical-devel @@ -28,8 +26,9 @@ BuildRequires: tar >= 1:1.22 BuildRequires: xz Requires: evolution >= %{version} Requires: evolution-data-server >= %{version} -Requires: glib2 >= 1:2.40.0 +Requires: glib2 >= 1:2.46.0 Requires: libsoup >= 2.42.0 +Obsoletes: evolution-ews-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -42,33 +41,14 @@ Ten pakiet pozwala programowi Evolution współpracować z serwerami Microsoft Exchange w wersji 2007 lub nowszej poprzez interfejs EWS (Exchange Web Services). -%package devel -Summary: Development files for EWS libraries -Summary(pl.UTF-8): Pliki programistyczne bibliotek EWS -Group: X11/Development/Libraries -Requires: evolution-data-server-devel >= %{version} -Requires: glib2-devel >= 1:2.40.0 -Requires: libsoup-devel >= 2.42.0 - -%description devel -This package provides development files for EWS library. - -%description devel -l pl.UTF-8 -Ten pakiet zawiera pliki programistyczne bibliotek EWS. - %prep %setup -q -%patch0 -p1 %build -%{__intltoolize} -%{__libtoolize} -%{__aclocal} -I m4 -%{__autoconf} -%{__autoheader} -%{__automake} -%configure \ - --disable-silent-rules +%cmake \ + -DLIBEXEC_INSTALL_DIR=%{_libdir} \ + -DENABLE_SCHEMAS_COMPILE=OFF + %{__make} %install @@ -77,10 +57,6 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution-data-server/*.la -%{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution-data-server/*/*.la -%{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution/modules/*.la - %find_lang %{name} %clean @@ -89,8 +65,9 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/evolution-data-server/libeews-1.2.so* -%attr(755,root,root) %{_libdir}/evolution-data-server/libewsutils.so* +%dir %{_libdir}/evolution-ews +%attr(755,root,root) %{_libdir}/evolution-ews/libcamelews-priv.so +%attr(755,root,root) %{_libdir}/evolution-ews/libevolution-ews.so %attr(755,root,root) %{_libdir}/evolution-data-server/addressbook-backends/libebookbackendews.so %attr(755,root,root) %{_libdir}/evolution-data-server/calendar-backends/libecalbackendews.so %attr(755,root,root) %{_libdir}/evolution-data-server/camel-providers/libcamelews.so @@ -100,7 +77,3 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/evolution/errors/module-ews-configuration.error %{_datadir}/evolution-data-server/ews %{_datadir}/appdata/evolution-ews.metainfo.xml - -%files devel -%defattr(644,root,root,755) -%{_includedir}/evolution-data-server/ews -- 2.43.0