[compiz/f18: 28/28] Merge branch 'master' into f18

[Wolfgang Ulbrich]

commit 341cd19f6a4d7e86a167b9fe93f1ac5e464dc011
Merge: dde0f08 ec4a8d7
Author: raveit <chat-to-me at raveit.de>
Date:   Sun May 26 17:12:14 2013 +0200

    Merge branch 'master' into f18

 compiz-aarch64.patch                               | 1144 +++++++
 compiz-decorator-emerald                           |   24 +
 compiz-decorator-gtk                               |   29 +
 compiz-lxde-emerald                                |    2 +-
 compiz-lxde-emerald.desktop                        |    2 +-
 compiz-mate-emerald                                |    2 +-
 compiz-mate-emerald.desktop                        |    2 +-
 compiz-mate-gtk                                    |    2 +-
 compiz-mate-gtk.desktop                            |    2 +-
 compiz-xfce-emerald                                |   28 +
 compiz-xfce-emerald.desktop                        |   12 +
 compiz.spec                                        |  223 +-
 compiz_automake-1.13.patch                         |   49 +
 ...get_smclient-id_from_DESKTOP-AUTOSTART-ID.patch |   16 +
 ...ck.patch => compiz_libwnck_to_libmatewnck.patch |   53 -
 compiz_new_mate.patch                              | 3436 +-------------------
 compiz_removal_gconf.patch                         |  570 ++++
 compiz_remove_kde.patch                            | 2007 ------------
 ...ybindings_and_mate-windows-settings_files.patch |    0
 compiz_remove_mateconf_dbus_glib.patch             |   10 +-
 emerald-decorator.desktop                          |   13 +
 emerald-decorator.svg                              |  396 +++
 gtk-decorator.desktop                              |   13 +
 gtk-decorator.svg                                  |  454 +++
 24 files changed, 2965 insertions(+), 5524 deletions(-)
---
diff --cc compiz.spec
index c5692e5,f0edc4e..df7f740
--- a/compiz.spec
+++ b/compiz.spec
@@@ -204,11 -229,23 +229,24 @@@ desktop-file-install --vendor="" 
  desktop-file-install --vendor="" \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    %SOURCE6
+ desktop-file-install --vendor="" \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %SOURCE8
+ desktop-file-install --vendor="" \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %SOURCE10
+ desktop-file-install --vendor="" \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %SOURCE12
  
 +
  # matecompat icon
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps
- cp -f %SOURCE7 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg
+ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+ cp -f %SOURCE13 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/plugin-matecompat.svg
+ # emerald-decorator icon
+ cp -f %SOURCE14 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/emerald-decorator.svg
+ # gtk-decorator icon
+ cp -f %SOURCE15 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gtk-decorator.svg
  
  rm $RPM_BUILD_ROOT%{_datadir}/applications/compiz.desktop