diff --git a/libplist.changes b/libplist.changes index 083af6e..e4eab04 100644 --- a/libplist.changes +++ b/libplist.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 5 12:24:02 UTC 2011 - uli@suse.com + +- cross-build fix: set cmake root, python paths +- cross-build workaround: move installed files from sysroot to + real root + ------------------------------------------------------------------- Tue Jun 28 13:59:00 UTC 2011 - aj@suse.de diff --git a/libplist.spec b/libplist.spec index 762f338..577dedd 100644 --- a/libplist.spec +++ b/libplist.spec @@ -115,11 +115,15 @@ This package contains the python bindings. %build export CFLAGS="%{optflags} -fno-strict-aliasing" +%configure || true cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR=%{_lib} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DPYTHON_VERSION=%{py_ver} \ -DPYTHON_SITEDIR=%{py_sitedir} \ + -DCMAKE_FIND_ROOT_PATH=/%{?_sysroot} \ + -DPYTHON_LIBRARY=%_libdir/python%{py_ver} \ + -DPYTHON_INCLUDE_DIR=%{?_sysroot}/usr/include/python \ . make %{?jobs:-j%jobs} @@ -128,6 +132,11 @@ make %{?jobs:-j%jobs} rm %{buildroot}%{_bindir}/plutil mv %{buildroot}%{_bindir}/plutil-%{version} %{buildroot}%{_bindir}/plutil +%if 0%{?_crossbuild} +cp -a %{buildroot}%{?_sysroot}/* %{buildroot}/ +rm -fr %{buildroot}%{?_sysroot} +%endif + %clean rm -rf %{buildroot}