diff --git a/.gitignore b/.gitignore index e69de29..0ce7d85 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/compiz-plugins-extra-0.8.8.tar.bz2 diff --git a/compiz-plugins-extra.spec b/compiz-plugins-extra.spec new file mode 100644 index 0000000..1fe06ea --- /dev/null +++ b/compiz-plugins-extra.spec @@ -0,0 +1,120 @@ +%global plugins 3d addhelper animationaddon bench bicubic crashhandler cubeaddon extrawm fadedesktop firepaint gears grid group loginout maximumize mblur notification reflex scalefilter shelf showdesktop showmouse splash trailfocus wallpaper widget + +%global basever 0.8.8 + +Name: compiz-plugins-extra +Version: 0.8.8 +Release: 7%{?dist} +Epoch: 1 +Summary: Additional Compiz Fusion plugins for Compiz + +Group: User Interface/Desktops +License: GPLv2+ and MIT +URL: http://www.compiz.org +Source0: http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2 +Patch0: compiz-plugins-extra_mate.patch + +# libdrm is not available on these arches +ExcludeArch: s390 s390x + +BuildRequires: compiz-plugins-main-devel >= %{basever} +BuildRequires: compiz-bcop >= %{basever} +BuildRequires: gettext-devel +BuildRequires: perl(XML::Parser) +BuildRequires: mesa-libGLU-devel +BuildRequires: libXrender-devel +BuildRequires: libmatenotify-devel +BuildRequires: libjpeg-devel +BuildRequires: intltool + +Requires: compiz-plugins-main%{?_isa} >= %{basever} + +Provides: compiz-fusion-extra%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: compiz-fusion-extra%{?_isa} < %{epoch}:%{version}-%{release} + +%description +The Compiz Fusion Project brings 3D desktop visual effects that improve +usability of the X Window System and provide increased productivity +though plugins and themes contributed by the community giving a +rich desktop experience. +This package contains additional plugins from the Compiz Fusion Project + +%package devel +Group: Development/Libraries +Summary: Development files for Compiz-Fusion +Requires: compiz-plugins-main-devel%{?_isa} >= %{basever} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Provides: compiz-fusion-extra-devel%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: compiz-fusion-extra-devel%{?_isa} < %{epoch}:%{version}-%{release} + +%description devel +This package contain development files required for developing other plugins + + +%prep +%setup -q +%patch0 -p1 -b .mate + + +%build +%configure --disable-schemas +make %{?_smp_mflags} + + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' + +%find_lang %{name} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files -f %{name}.lang +%doc COPYING AUTHORS +%{_libdir}/compiz/*.so +%{_datadir}/compiz/*.xml +%{_datadir}/compiz/*.png + +%files devel +%{_includedir}/compiz/ +%{_libdir}/pkgconfig/compiz-* + + +%changelog +* Sun Jan 13 2013 Wolfgang Ulbrich - 1:0.8.8-7 +- obsolete compiz-fusion-extra + +* Sat Jan 12 2013 Wolfgang Ulbrich - 1:0.8.8-6 +- add ldconfig scriplets +- trailing whitespace from the Summary,Group,License and URL lines + +* Sat Dec 22 2012 Wolfgang Ulbrich - 1:0.8.8-5 +- disable mateconf schemas +- remove rpm scriptlet +- remove mate subpackage +- remove copying part from mate patch + +* Mon Oct 15 2012 Wolfgang Ulbrich - 1:0.8.8-4 +- build for fedora +- rename patch +- own include dir +- fix license information +- add basever + +* Sat Sep 29 2012 Wolfgang Ulbrich - 1:0.8.8-3 +- add Epoch tag +- improve spec file + +* Wed Sep 19 2012 Wolfgang Ulbrich - 0.8.8-2 +- add compiz-plugins-extra_mate.patch +- improve spec file + +* Tue May 15 2012 Wolfgang Ulbrich - 0.8.8-1 +- build for mate + diff --git a/compiz-plugins-extra_mate.patch b/compiz-plugins-extra_mate.patch new file mode 100644 index 0000000..47fe56c --- /dev/null +++ b/compiz-plugins-extra_mate.patch @@ -0,0 +1,1515 @@ +diff -upr compiz-plugins-extra-0.8.8-orig/aclocal.m4 compiz-plugins-extra-0.8.8/aclocal.m4 +--- compiz-plugins-extra-0.8.8-orig/aclocal.m4 2011-04-21 13:55:42.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/aclocal.m4 2012-05-16 14:25:12.000000000 +0200 +@@ -19,40 +19,40 @@ You have another version of autoconf. I + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-dnl AM_GCONF_SOURCE_2 +-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +-dnl (i.e. pass to gconftool-2 +-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl AM_MATECONF_SOURCE_2 ++dnl Defines MATECONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to mateconftool-2 ++dnl Defines MATECONF_SCHEMA_FILE_DIR which is a filesystem directory where + dnl you should install foo.schemas files + dnl + +-AC_DEFUN([AM_GCONF_SOURCE_2], ++AC_DEFUN([AM_MATECONF_SOURCE_2], + [ +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ if test "x$MATECONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ MATECONF_SCHEMA_CONFIG_SOURCE=`mateconftool-2 --get-default-source` + else +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ MATECONF_SCHEMA_CONFIG_SOURCE=$MATECONF_SCHEMA_INSTALL_SOURCE + fi + +- AC_ARG_WITH([gconf-source], +- AC_HELP_STRING([--with-gconf-source=sourceaddress], ++ AC_ARG_WITH([mateconf-source], ++ AC_HELP_STRING([--with-mateconf-source=sourceaddress], + [Config database for installing schema files.]), +- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++ [MATECONF_SCHEMA_CONFIG_SOURCE="$withval"],) + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++ AC_SUBST(MATECONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ if test "x$MATECONF_SCHEMA_FILE_DIR" = "x"; then ++ MATECONF_SCHEMA_FILE_DIR='$(sysconfdir)/mateconf/schemas' + fi + +- AC_ARG_WITH([gconf-schema-file-dir], +- AC_HELP_STRING([--with-gconf-schema-file-dir=dir], ++ AC_ARG_WITH([mateconf-schema-file-dir], ++ AC_HELP_STRING([--with-mateconf-schema-file-dir=dir], + [Directory for installing schema files.]), +- [GCONF_SCHEMA_FILE_DIR="$withval"],) ++ [MATECONF_SCHEMA_FILE_DIR="$withval"],) + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ AC_SUBST(MATECONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files]) + + AC_ARG_ENABLE(schemas-install, + AC_HELP_STRING([--disable-schemas-install], +@@ -61,7 +61,7 @@ AC_DEFUN([AM_GCONF_SOURCE_2], + yes|no) ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; + esac]) +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++ AM_CONDITIONAL([MATECONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) + ]) + + # Copyright (C) 1995-2002 Free Software Foundation, Inc. +diff -upr compiz-plugins-extra-0.8.8-orig/config.h.in compiz-plugins-extra-0.8.8/config.h.in +--- compiz-plugins-extra-0.8.8-orig/config.h.in 2011-04-21 13:55:44.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/config.h.in 2012-05-16 14:24:42.000000000 +0200 +@@ -27,8 +27,8 @@ + /* Define if your file defines LC_MESSAGES. */ + #undef HAVE_LC_MESSAGES + +-/* libnotify >= 0.6.1 present */ +-#undef HAVE_LIBNOTIFY_0_6_1 ++/* libmatenotify >= 0.6.1 present */ ++#undef HAVE_LIBMATENOTIFY_0_6_1 + + /* Define to 1 if you have the header file. */ + #undef HAVE_LOCALE_H +@@ -91,7 +91,7 @@ + /* Build notification plugin */ + #undef USE_NOTIFICATION + +-/* Build gconf schemas */ ++/* Build mateconf schemas */ + #undef USE_SCHEMAS + + /* Version number of package */ +diff -upr compiz-plugins-extra-0.8.8-orig/configure compiz-plugins-extra-0.8.8/configure +--- compiz-plugins-extra-0.8.8-orig/configure 2011-04-21 13:55:44.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/configure 2012-05-16 14:25:15.000000000 +0200 +@@ -748,22 +748,22 @@ LTLIBOBJS + LIBOBJS + USE_SCHEMAS_FALSE + USE_SCHEMAS_TRUE +-GCONF_SCHEMAS_INSTALL_FALSE +-GCONF_SCHEMAS_INSTALL_TRUE +-GCONF_SCHEMA_FILE_DIR +-GCONF_SCHEMA_CONFIG_SOURCE ++MATECONF_SCHEMAS_INSTALL_FALSE ++MATECONF_SCHEMAS_INSTALL_TRUE ++MATECONF_SCHEMA_FILE_DIR ++MATECONF_SCHEMA_CONFIG_SOURCE + xsltdir + SCHEMAS_LIBS + SCHEMAS_CFLAGS +-GCONFTOOL ++MATECONFTOOL + ANIMATIONADDON_PLUGIN_FALSE + ANIMATIONADDON_PLUGIN_TRUE + COMPIZANIMATION_LIBS + COMPIZANIMATION_CFLAGS + NOTIFICATION_PLUGIN_FALSE + NOTIFICATION_PLUGIN_TRUE +-LIBNOTIFY_LIBS +-LIBNOTIFY_CFLAGS ++LIBMATENOTIFY_LIBS ++LIBMATENOTIFY_CFLAGS + SHOWMOUSE_PLUGIN_FALSE + SHOWMOUSE_PLUGIN_TRUE + COMPIZMOUSEPOLL_LIBS +@@ -960,8 +960,8 @@ enable_nls + with_gl_cflags + with_gl_libs + enable_schemas +-with_gconf_source +-with_gconf_schema_file_dir ++with_mateconf_source ++with_mateconf_schema_file_dir + enable_schemas_install + ' + ac_precious_vars='build_alias +@@ -988,8 +988,8 @@ COMPIZCUBE_CFLAGS + COMPIZCUBE_LIBS + COMPIZMOUSEPOLL_CFLAGS + COMPIZMOUSEPOLL_LIBS +-LIBNOTIFY_CFLAGS +-LIBNOTIFY_LIBS ++LIBMATENOTIFY_CFLAGS ++LIBMATENOTIFY_LIBS + COMPIZANIMATION_CFLAGS + COMPIZANIMATION_LIBS + SCHEMAS_CFLAGS +@@ -1625,7 +1625,7 @@ Optional Features: + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-nls do not use Native Language Support +- --enable-schemas Build gconf schemas ++ --enable-schemas Build mateconf schemas + --disable-schemas-install + Disable the schemas installation + +@@ -1637,9 +1637,9 @@ Optional Packages: + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-gl-cflags=CFLAGS + --with-gl-libs=LIBS +- --with-gconf-source=sourceaddress ++ --with-mateconf-source=sourceaddress + Config database for installing schema files. +- --with-gconf-schema-file-dir=dir ++ --with-mateconf-schema-file-dir=dir + Directory for installing schema files. + + Some influential environment variables: +@@ -1676,10 +1676,10 @@ Some influential environment variables: + C compiler flags for COMPIZMOUSEPOLL, overriding pkg-config + COMPIZMOUSEPOLL_LIBS + linker flags for COMPIZMOUSEPOLL, overriding pkg-config +- LIBNOTIFY_CFLAGS +- C compiler flags for LIBNOTIFY, overriding pkg-config +- LIBNOTIFY_LIBS +- linker flags for LIBNOTIFY, overriding pkg-config ++ LIBMATENOTIFY_CFLAGS ++ C compiler flags for LIBMATENOTIFY, overriding pkg-config ++ LIBMATENOTIFY_LIBS ++ linker flags for LIBMATENOTIFY, overriding pkg-config + COMPIZANIMATION_CFLAGS + C compiler flags for COMPIZANIMATION, overriding pkg-config + COMPIZANIMATION_LIBS +@@ -13722,35 +13722,35 @@ fi + + + pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 +-$as_echo_n "checking for LIBNOTIFY... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMATENOTIFY" >&5 ++$as_echo_n "checking for LIBMATENOTIFY... " >&6; } + +-if test -n "$LIBNOTIFY_CFLAGS"; then +- pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" ++if test -n "$LIBMATENOTIFY_CFLAGS"; then ++ pkg_cv_LIBMATENOTIFY_CFLAGS="$LIBMATENOTIFY_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-2.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libnotify gtk+-2.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmatenotify gtk+-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmatenotify gtk+-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify gtk+-2.0" 2>/dev/null` ++ pkg_cv_LIBMATENOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libmatenotify gtk+-2.0" 2>/dev/null` + else + pkg_failed=yes + fi + else + pkg_failed=untried + fi +-if test -n "$LIBNOTIFY_LIBS"; then +- pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" ++if test -n "$LIBMATENOTIFY_LIBS"; then ++ pkg_cv_LIBMATENOTIFY_LIBS="$LIBMATENOTIFY_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-2.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libnotify gtk+-2.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmatenotify gtk+-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmatenotify gtk+-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify gtk+-2.0" 2>/dev/null` ++ pkg_cv_LIBMATENOTIFY_LIBS=`$PKG_CONFIG --libs "libmatenotify gtk+-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13770,26 +13770,26 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify gtk+-2.0" 2>&1` ++ LIBMATENOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmatenotify gtk+-2.0" 2>&1` + else +- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify gtk+-2.0" 2>&1` ++ LIBMATENOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmatenotify gtk+-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs +- echo "$LIBNOTIFY_PKG_ERRORS" >&5 ++ echo "$LIBMATENOTIFY_PKG_ERRORS" >&5 + +- have_libnotify=no ++ have_libmatenotify=no + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- have_libnotify=no ++ have_libmatenotify=no + else +- LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS +- LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS ++ LIBMATENOTIFY_CFLAGS=$pkg_cv_LIBMATENOTIFY_CFLAGS ++ LIBMATENOTIFY_LIBS=$pkg_cv_LIBMATENOTIFY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- have_libnotify=yes ++ have_libmatenotify=yes + fi +- if test "x$have_libnotify" = "xyes"; then ++ if test "x$have_libmatenotify" = "xyes"; then + NOTIFICATION_PLUGIN_TRUE= + NOTIFICATION_PLUGIN_FALSE='#' + else +@@ -13797,23 +13797,23 @@ else + NOTIFICATION_PLUGIN_FALSE= + fi + +-if test "$have_libnotify" = yes; then ++if test "$have_libmatenotify" = yes; then + + $as_echo "#define USE_NOTIFICATION 1" >>confdefs.h + + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.6.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libnotify >= 0.6.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmatenotify >= 0.6.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmatenotify >= 0.6.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- have_libnotify_0_6_1=yes ++ have_libmatenotify_0_6_1=yes + else +- have_libnotify_0_6_1=no ++ have_libmatenotify_0_6_1=no + fi +- if test "$have_libnotify_0_6_1" = yes; then ++ if test "$have_libmatenotify_0_6_1" = yes; then + +-$as_echo "#define HAVE_LIBNOTIFY_0_6_1 1" >>confdefs.h ++$as_echo "#define HAVE_LIBMATENOTIFY_0_6_1 1" >>confdefs.h + + fi + fi +@@ -13905,16 +13905,16 @@ fi + + + if test x"$use_schemas" = x"yes"; then +- # Extract the first word of "gconftool-2", so it can be a program name with args. +-set dummy gconftool-2; ac_word=$2 ++ # Extract the first word of "mateconftool-2", so it can be a program name with args. ++set dummy mateconftool-2; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GCONFTOOL+set}" = set; then : ++if test "${ac_cv_path_MATECONFTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- case $GCONFTOOL in ++ case $MATECONFTOOL in + [\\/]* | ?:[\\/]*) +- ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. ++ ac_cv_path_MATECONFTOOL="$MATECONFTOOL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -13924,7 +13924,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_MATECONFTOOL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -13932,14 +13932,14 @@ done + done + IFS=$as_save_IFS + +- test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no" ++ test -z "$ac_cv_path_MATECONFTOOL" && ac_cv_path_MATECONFTOOL="no" + ;; + esac + fi +-GCONFTOOL=$ac_cv_path_GCONFTOOL +-if test -n "$GCONFTOOL"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 +-$as_echo "$GCONFTOOL" >&6; } ++MATECONFTOOL=$ac_cv_path_MATECONFTOOL ++if test -n "$MATECONFTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MATECONFTOOL" >&5 ++$as_echo "$MATECONFTOOL" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -13955,12 +13955,12 @@ if test -n "$SCHEMAS_CFLAGS"; then + pkg_cv_SCHEMAS_CFLAGS="$SCHEMAS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"compiz-gconf\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "compiz-gconf") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"compiz-mateconf\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "compiz-mateconf") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_SCHEMAS_CFLAGS=`$PKG_CONFIG --cflags "compiz-gconf" 2>/dev/null` ++ pkg_cv_SCHEMAS_CFLAGS=`$PKG_CONFIG --cflags "compiz-mateconf" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13971,12 +13971,12 @@ if test -n "$SCHEMAS_LIBS"; then + pkg_cv_SCHEMAS_LIBS="$SCHEMAS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"compiz-gconf\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "compiz-gconf") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"compiz-mateconf\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "compiz-mateconf") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_SCHEMAS_LIBS=`$PKG_CONFIG --libs "compiz-gconf" 2>/dev/null` ++ pkg_cv_SCHEMAS_LIBS=`$PKG_CONFIG --libs "compiz-mateconf" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13996,9 +13996,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SCHEMAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "compiz-gconf" 2>&1` ++ SCHEMAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "compiz-mateconf" 2>&1` + else +- SCHEMAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "compiz-gconf" 2>&1` ++ SCHEMAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "compiz-mateconf" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SCHEMAS_PKG_ERRORS" >&5 +@@ -14015,8 +14015,8 @@ else + $as_echo "yes" >&6; } + use_schemas=yes + fi +- if test x"$GCONFTOOL" = xno; then +- as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 ++ if test x"$MATECONFTOOL" = xno; then ++ as_fn_error $? "mateconftool-2 executable not found in your path - should be installed with MateConf" "$LINENO" 5 + fi + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +@@ -14062,42 +14062,42 @@ fi + if test x"$PKG_CONFIG" = xno ; then + as_fn_error $? "pkg-config executable not found in your path, unable to determine schema directory" "$LINENO" 5 + fi +- xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf` ++ xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-mateconf` + + fi + + +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ if test "x$MATECONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ MATECONF_SCHEMA_CONFIG_SOURCE=`mateconftool-2 --get-default-source` + else +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ MATECONF_SCHEMA_CONFIG_SOURCE=$MATECONF_SCHEMA_INSTALL_SOURCE + fi + + +-# Check whether --with-gconf-source was given. +-if test "${with_gconf_source+set}" = set; then : +- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" ++# Check whether --with-mateconf-source was given. ++if test "${with_mateconf_source+set}" = set; then : ++ withval=$with_mateconf_source; MATECONF_SCHEMA_CONFIG_SOURCE="$withval" + fi + + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 +-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 ++$as_echo "Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ if test "x$MATECONF_SCHEMA_FILE_DIR" = "x"; then ++ MATECONF_SCHEMA_FILE_DIR='$(sysconfdir)/mateconf/schemas' + fi + + +-# Check whether --with-gconf-schema-file-dir was given. +-if test "${with_gconf_schema_file_dir+set}" = set; then : +- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" ++# Check whether --with-mateconf-schema-file-dir was given. ++if test "${with_mateconf_schema_file_dir+set}" = set; then : ++ withval=$with_mateconf_schema_file_dir; MATECONF_SCHEMA_FILE_DIR="$withval" + fi + + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 +-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 ++$as_echo "Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } + + # Check whether --enable-schemas-install was given. + if test "${enable_schemas_install+set}" = set; then : +@@ -14108,11 +14108,11 @@ if test "${enable_schemas_install+set}" + fi + + if test "$enable_schemas_install" != no; then +- GCONF_SCHEMAS_INSTALL_TRUE= +- GCONF_SCHEMAS_INSTALL_FALSE='#' ++ MATECONF_SCHEMAS_INSTALL_TRUE= ++ MATECONF_SCHEMAS_INSTALL_FALSE='#' + else +- GCONF_SCHEMAS_INSTALL_TRUE='#' +- GCONF_SCHEMAS_INSTALL_FALSE= ++ MATECONF_SCHEMAS_INSTALL_TRUE='#' ++ MATECONF_SCHEMAS_INSTALL_FALSE= + fi + + +@@ -14289,8 +14289,8 @@ if test -z "${ANIMATIONADDON_PLUGIN_TRUE + as_fn_error $? "conditional \"ANIMATIONADDON_PLUGIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then +- as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++if test -z "${MATECONF_SCHEMAS_INSTALL_TRUE}" && test -z "${MATECONF_SCHEMAS_INSTALL_FALSE}"; then ++ as_fn_error $? "conditional \"MATECONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${USE_SCHEMAS_TRUE}" && test -z "${USE_SCHEMAS_FALSE}"; then +diff -upr compiz-plugins-extra-0.8.8-orig/configure.ac compiz-plugins-extra-0.8.8/configure.ac +--- compiz-plugins-extra-0.8.8-orig/configure.ac 2011-04-21 13:51:08.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/configure.ac 2012-05-16 14:24:44.000000000 +0200 +@@ -136,13 +136,13 @@ AM_CONDITIONAL(THREED_PLUGIN, test "x$ha + PKG_CHECK_MODULES(COMPIZMOUSEPOLL, compiz-mousepoll, [have_compiz_mousepoll=yes], [have_compiz_mousepoll=no]) + AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" = "xyes") + +-PKG_CHECK_MODULES(LIBNOTIFY, libnotify gtk+-2.0, [have_libnotify=yes], [have_libnotify=no]) +-AM_CONDITIONAL(NOTIFICATION_PLUGIN, test "x$have_libnotify" = "xyes") +-if test "$have_libnotify" = yes; then ++PKG_CHECK_MODULES(LIBMATENOTIFY, libmatenotify gtk+-2.0, [have_libmatenotify=yes], [have_libmatenotify=no]) ++AM_CONDITIONAL(NOTIFICATION_PLUGIN, test "x$have_libmatenotify" = "xyes") ++if test "$have_libmatenotify" = yes; then + AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin]) +- PKG_CHECK_EXISTS(libnotify >= 0.6.1, [have_libnotify_0_6_1=yes], [have_libnotify_0_6_1=no]) +- if test "$have_libnotify_0_6_1" = yes; then +- AC_DEFINE(HAVE_LIBNOTIFY_0_6_1, 1, [libnotify >= 0.6.1 present]) ++ PKG_CHECK_EXISTS(libmatenotify >= 0.6.1, [have_libmatenotify_0_6_1=yes], [have_libmatenotify_0_6_1=no]) ++ if test "$have_libmatenotify_0_6_1" = yes; then ++ AC_DEFINE(HAVE_LIBMATENOTIFY_0_6_1, 1, [libmatenotify >= 0.6.1 present]) + fi + fi + +@@ -150,29 +150,29 @@ PKG_CHECK_MODULES(COMPIZANIMATION, compi + AM_CONDITIONAL(ANIMATIONADDON_PLUGIN, test "x$have_compiz_animation" = "xyes") + + AC_ARG_ENABLE(schemas, +- [ --enable-schemas Build gconf schemas], ++ [ --enable-schemas Build mateconf schemas], + [use_schemas=$enableval], [use_schemas=no]) + + if test x"$use_schemas" = x"yes"; then +- AC_PATH_PROG(GCONFTOOL, gconftool-2, no) +- PKG_CHECK_MODULES(SCHEMAS, compiz-gconf, [use_schemas=yes], [use_schemas=no]) +- if test x"$GCONFTOOL" = xno; then +- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) ++ AC_PATH_PROG(MATECONFTOOL, mateconftool-2, no) ++ PKG_CHECK_MODULES(SCHEMAS, compiz-mateconf, [use_schemas=yes], [use_schemas=no]) ++ if test x"$MATECONFTOOL" = xno; then ++ AC_MSG_ERROR([mateconftool-2 executable not found in your path - should be installed with MateConf]) + fi + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + if test x"$PKG_CONFIG" = xno ; then + AC_MSG_ERROR([pkg-config executable not found in your path, unable to determine schema directory]) + fi +- xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf` ++ xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-mateconf` + AC_SUBST(xsltdir) + fi + +-AM_GCONF_SOURCE_2 ++AM_MATECONF_SOURCE_2 + + + AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes") + if test "$use_schemas" = yes; then +- AC_DEFINE(USE_SCHEMAS, 1, [Build gconf schemas]) ++ AC_DEFINE(USE_SCHEMAS, 1, [Build mateconf schemas]) + fi + + AC_OUTPUT([ +diff -upr compiz-plugins-extra-0.8.8-orig/images/Makefile.in compiz-plugins-extra-0.8.8/images/Makefile.in +--- compiz-plugins-extra-0.8.8-orig/images/Makefile.in 2011-04-21 13:55:45.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/images/Makefile.in 2012-05-16 14:24:45.000000000 +0200 +@@ -108,9 +108,9 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ +-GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++MATECONFTOOL = @MATECONFTOOL@ ++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ ++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GL_CFLAGS = @GL_CFLAGS@ + GL_LIBS = @GL_LIBS@ +@@ -132,8 +132,8 @@ INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ +-LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ +-LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ ++LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ +diff -upr compiz-plugins-extra-0.8.8-orig/include/Makefile.in compiz-plugins-extra-0.8.8/include/Makefile.in +--- compiz-plugins-extra-0.8.8-orig/include/Makefile.in 2011-04-21 13:55:45.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/include/Makefile.in 2012-05-16 14:24:45.000000000 +0200 +@@ -112,9 +112,9 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ +-GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++MATECONFTOOL = @MATECONFTOOL@ ++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ ++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GL_CFLAGS = @GL_CFLAGS@ + GL_LIBS = @GL_LIBS@ +@@ -136,8 +136,8 @@ INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ +-LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ +-LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ ++LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ +diff -upr compiz-plugins-extra-0.8.8-orig/Makefile.in compiz-plugins-extra-0.8.8/Makefile.in +--- compiz-plugins-extra-0.8.8-orig/Makefile.in 2011-04-21 13:55:46.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/Makefile.in 2012-05-16 14:24:49.000000000 +0200 +@@ -164,9 +164,9 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ +-GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++MATECONFTOOL = @MATECONFTOOL@ ++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ ++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GL_CFLAGS = @GL_CFLAGS@ + GL_LIBS = @GL_LIBS@ +@@ -188,8 +188,8 @@ INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ +-LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ +-LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ ++LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ +diff -upr compiz-plugins-extra-0.8.8-orig/metadata/Makefile.am compiz-plugins-extra-0.8.8/metadata/Makefile.am +--- compiz-plugins-extra-0.8.8-orig/metadata/Makefile.am 2011-04-21 13:51:08.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/metadata/Makefile.am 2012-05-16 14:24:43.000000000 +0200 +@@ -63,17 +63,17 @@ xml_DATA = $(xml_files) + @INTLTOOL_XML_RULE@ + + if USE_SCHEMAS +-schemadir = $(GCONF_SCHEMA_FILE_DIR) ++schemadir = $(MATECONF_SCHEMA_FILE_DIR) + schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files)) + schema_DATA = $(schema_files) + + %.schemas: $(xml_files) + xsltproc -o $@ $(xsltdir)/schemas.xslt $(subst compiz-,,$*).xml; + +-if GCONF_SCHEMAS_INSTALL ++if MATECONF_SCHEMAS_INSTALL + install-data-local: + if test -z "$(DESTDIR)" ; then \ +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \ ++ MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA); \ + fi + endif + endif +diff -upr compiz-plugins-extra-0.8.8-orig/metadata/Makefile.in compiz-plugins-extra-0.8.8/metadata/Makefile.in +--- compiz-plugins-extra-0.8.8-orig/metadata/Makefile.in 2011-04-21 13:55:45.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/metadata/Makefile.in 2012-05-16 14:24:46.000000000 +0200 +@@ -108,9 +108,9 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ +-GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++MATECONFTOOL = @MATECONFTOOL@ ++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ ++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GL_CFLAGS = @GL_CFLAGS@ + GL_LIBS = @GL_LIBS@ +@@ -132,8 +132,8 @@ INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ +-LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ +-LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ ++LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ +@@ -274,7 +274,7 @@ xml_in_files = \ + + xml_files = $(xml_in_files:.xml.in=.xml) + xml_DATA = $(xml_files) +-@USE_SCHEMAS_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR) ++@USE_SCHEMAS_TRUE@schemadir = $(MATECONF_SCHEMA_FILE_DIR) + @USE_SCHEMAS_TRUE@schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files)) + @USE_SCHEMAS_TRUE@schema_DATA = $(schema_files) + EXTRA_DIST = \ +@@ -440,7 +440,7 @@ distclean-generic: + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +-@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: ++@MATECONF_SCHEMAS_INSTALL_FALSE@install-data-local: + @USE_SCHEMAS_FALSE@install-data-local: + clean: clean-am + +@@ -529,10 +529,10 @@ uninstall-am: uninstall-schemaDATA unins + @USE_SCHEMAS_TRUE@%.schemas: $(xml_files) + @USE_SCHEMAS_TRUE@ xsltproc -o $@ $(xsltdir)/schemas.xslt $(subst compiz-,,$*).xml; + +-@GCONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@install-data-local: +-@GCONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@ if test -z "$(DESTDIR)" ; then \ +-@GCONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \ +-@GCONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@ fi ++@MATECONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@install-data-local: ++@MATECONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@ if test -z "$(DESTDIR)" ; then \ ++@MATECONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@ MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA); \ ++@MATECONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@ fi + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -upr compiz-plugins-extra-0.8.8-orig/metadata/notification.xml.in compiz-plugins-extra-0.8.8/metadata/notification.xml.in +--- compiz-plugins-extra-0.8.8-orig/metadata/notification.xml.in 2011-04-21 13:51:08.000000000 +0200 ++++ compiz-plugins-extra-0.8.8/metadata/notification.xml.in 2012-05-16 14:24:43.000000000 +0200 +@@ -2,7 +2,7 @@ + + + <_short>Error Notifications +- <_long>Display errors and other messages using libnotify. ++ <_long>Display errors and other messages using libmatenotify. + Utility + +