From 76c53433177fb2f49b31c7f4f5bdbb5f30c31dff Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 20 Jul 2020 13:15:06 +0200 Subject: [PATCH] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- evolution-data-server.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 1b729c6..88a075c 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + %define ldap_support 1 %define static_ldap 0 %define krb5_support 1 @@ -182,9 +184,6 @@ the functionality of the installed %{name} package. %build -mkdir -p _build -cd _build - %if %{ldap_support} %if %{static_ldap} @@ -261,15 +260,12 @@ export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-d %endif %ldap_flags %krb5_flags %ssl_flags \ %largefile_flags %gtkdoc_flags %phonenum_flags \ - .. + %{nil} -make %{?_smp_mflags} +%cmake_build %install -cd _build -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install +%cmake_install # make sure the directory exists, because it's owned by eds mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || : @@ -456,7 +452,7 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_datadir}/vala/vapi/libedataserverui-1.2.deps %{_datadir}/vala/vapi/libedataserverui-1.2.vapi -%files langpacks -f _build/%{name}.lang +%files langpacks -f %{name}.lang %if %{with_docs}