commit libcompizconfig for openSUSE:Factory
Hello community, here is the log from the commit of package libcompizconfig for openSUSE:Factory checked in at Thu Sep 29 12:52:32 CEST 2011. -------- --- openSUSE:Factory/libcompizconfig/libcompizconfig.changes 2011-09-28 15:28:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/libcompizconfig/libcompizconfig.changes 2011-09-29 09:36:21.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 29 07:17:48 UTC 2011 - dimstar@opensuse.org + +- Add libcompizconfig-backend-path.patch: Revert the change of the + backend installation location. This is simply not where + libcompizconfig is looking to find the backends. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libcompizconfig-backend-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcompizconfig.spec ++++++ --- /var/tmp/diff_new_pack.R2B43r/_old 2011-09-29 12:52:27.000000000 +0200 +++ /var/tmp/diff_new_pack.R2B43r/_new 2011-09-29 12:52:27.000000000 +0200 @@ -27,6 +27,8 @@ Source: %name.tar.bz2 # Helper script to update to latest git. Source99: update.sh +# PATCH-FIX-UPSTREAM dimstar@opensuse.org -- Change the backend install location. As this seems wrong, we revert this commit for now. Reported upstream. +Patch0: libcompizconfig-backend-path.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: compiz-devel @@ -56,6 +58,7 @@ %prep %setup -q -n %{name} +%patch0 -p1 -R mkdir build %build @@ -98,7 +101,7 @@ %files -f %{name}.schemas_list %defattr(-, root, root) -%{_libexecdir}/compizconfig/ +%{_libdir}/compizconfig/ %{_libdir}/compiz/libccp.so %{_libdir}/libcompizconfig.so.0* %{_datadir}/compiz/ccp.xml ++++++ libcompizconfig-backend-path.patch ++++++
From 9d32d80e86dc820b512c7fb68a0191e5184762ed Mon Sep 17 00:00:00 2001 From: Sam Spilsbury <sam.spilsbury@canonical.com> Date: Wed, 13 Jul 2011 07:33:53 +0000 Subject: There is no sane reason to have backends always go in the same path as the
detected libcompizconfig, so mandate that they go in CMAKE_INSTALL_PREFIX for now --- diff --git a/cmake/LibCompizConfigCommon.cmake b/cmake/LibCompizConfigCommon.cmake index 0f10470..4260f40 100644 --- a/cmake/LibCompizConfigCommon.cmake +++ b/cmake/LibCompizConfigCommon.cmake @@ -106,7 +106,7 @@ function (compizconfig_backend bname) set_target_properties ( ${bname} PROPERTIES - INSTALL_RPATH "${COMPIZCONFIG_LIBDIR}" + INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" COMPILE_FLAGS "${${_BACKEND}_CFLAGSADD}" LINK_FLAGS "${${_BACKEND}_LDFLAGSADD}" ) @@ -122,7 +122,7 @@ function (compizconfig_backend bname) install ( TARGETS ${bname} - DESTINATION ${COMPIZ_DESTDIR}${COMPIZCONFIG_LIBDIR}/compizconfig/backends + DESTINATION ${COMPIZ_DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/compizconfig/backends ) if (NOT _COMPIZCONFIG_INTERNAL) -- cgit v0.8.3.1-30-gff3a ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de