Improve compatibility with new CMake macro
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
df59ee3bad
commit
76c5343317
@ -1,3 +1,5 @@
|
|||||||
|
%undefine __cmake_in_source_build
|
||||||
|
|
||||||
%define ldap_support 1
|
%define ldap_support 1
|
||||||
%define static_ldap 0
|
%define static_ldap 0
|
||||||
%define krb5_support 1
|
%define krb5_support 1
|
||||||
@ -182,9 +184,6 @@ the functionality of the installed %{name} package.
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
mkdir -p _build
|
|
||||||
cd _build
|
|
||||||
|
|
||||||
%if %{ldap_support}
|
%if %{ldap_support}
|
||||||
|
|
||||||
%if %{static_ldap}
|
%if %{static_ldap}
|
||||||
@ -261,15 +260,12 @@ export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-d
|
|||||||
%endif
|
%endif
|
||||||
%ldap_flags %krb5_flags %ssl_flags \
|
%ldap_flags %krb5_flags %ssl_flags \
|
||||||
%largefile_flags %gtkdoc_flags %phonenum_flags \
|
%largefile_flags %gtkdoc_flags %phonenum_flags \
|
||||||
..
|
%{nil}
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
cd _build
|
%cmake_install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
make DESTDIR=$RPM_BUILD_ROOT install
|
|
||||||
|
|
||||||
# make sure the directory exists, because it's owned by eds
|
# make sure the directory exists, because it's owned by eds
|
||||||
mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || :
|
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.deps
|
||||||
%{_datadir}/vala/vapi/libedataserverui-1.2.vapi
|
%{_datadir}/vala/vapi/libedataserverui-1.2.vapi
|
||||||
|
|
||||||
%files langpacks -f _build/%{name}.lang
|
%files langpacks -f %{name}.lang
|
||||||
|
|
||||||
%if %{with_docs}
|
%if %{with_docs}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user