[mate-desktop/f18: 5/5] Merge branch 'master' into f18

[Dan Mashal]

commit 393e31bf1aa649a578bb9c55a137f3cf4892c6e3
Merge: 11d67ce 5b9db1b
Author: dmashal <dan.mashal at fedoraproject.org>
Date:   Mon Sep 24 10:50:10 2012 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	mate-desktop.spec

 mate-desktop.spec                           |   54 ++--
 mate-desktop_remove_mate-bg-crossfade.patch |  472 ---------------------------
 2 files changed, 27 insertions(+), 499 deletions(-)
---
diff --cc mate-desktop.spec
index 60f7bcc,f3cea68..6c8739b
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@@ -1,9 -1,8 +1,16 @@@
++<<<<<<< HEAD
 +%global po_package mate-desktop-2.0
++=======
++>>>>>>> master
  
  Summary:	Shared code among gnome-panel, gnome-session, nautilus, etc
  Name:		mate-desktop
  Version:	1.4.1
++<<<<<<< HEAD
 +Release:	10%{?dist}
++=======
+ Release:	11%{?dist}
++>>>>>>> master
  URL:		http://mate-desktop.org
  Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
  
@@@ -57,11 -53,11 +61,9 @@@ libmatedesktop
  %setup -q
  %patch0 -p1 -b .pnp
  %patch1 -p1 -b .double-free
- %patch2 -p1 -b .mate-desktop_remove_mate-bg-crossfade
  NOCONFIGURE=1 ./autogen.sh
  
 -
  %build
--
  %configure \
  	--disable-libtool-lock	\
  	--disable-scrollkeeper	\
@@@ -70,8 -66,9 +72,8 @@@
  	--enable-unique	\
  	--enable-gtk-doc
  
- make %{?_smp_mflags}
+ make %{?_smp_mflags} V=1
  
 -
  %install
  make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
  find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@@ -83,22 -80,17 +85,18 @@@ rm -rf $RPM_BUILD_ROOT/var/scrollkeepe
  mkdir $RPM_BUILD_ROOT%{_datadir}/omf/mate
  mv -f $RPM_BUILD_ROOT%{_datadir}/omf/{fdl,gpl,lgpl} $RPM_BUILD_ROOT%{_datadir}/omf/mate
  
- desktop-file-install								\
- 	--remove-category="MATE"						\
- 	--add-category="X-Mate"							\
- 	--remove-only-show-in="MATE"					\
- 	--add-only-show-in="X-MATE"						\
- 	--delete-original								\
- 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications	\
- $RPM_BUILD_ROOT%{_datadir}/applications/mate-about.desktop
+ %find_lang %{name} --all-name
  
- %find_lang %{po_package} --all-name
+ desktop-file-install \
+   --remove-category="MATE" \
+   --add-category="X-Mate" \
+   --delete-original \
+   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+   $RPM_BUILD_ROOT%{_datadir}/applications/mate-about.desktop
  
- %post libs -p /sbin/ldconfig
- 
- %postun libs -p /sbin/ldconfig
  
- %files -f %{po_package}.lang
+ %files -f %{name}.lang
++>>>>>>> master
  %doc AUTHORS COPYING COPYING.LIB NEWS README
  %{_datadir}/applications/mate-about.desktop
  %doc %{_mandir}/man1/mate-about.1*
@@@ -106,18 -98,20 +104,16 @@@
  %{_bindir}/mate-about
  # LGPL
  %{_datadir}/mate/help/*/*/*.xml
- %{_datadir}/omf/mate
- %{_datadir}/mate-about
- 
- %files libs
- # LGPL
- %{_libdir}/libmate-desktop-2.so.*
+ %{_datadir}/omf/mate/
+ %{_datadir}/mate-about/
  
+ %post libs -p /sbin/ldconfig
+ %postun libs -p /sbin/ldconfig
  
 -%files libs
 -# LGPL
 -%{_libdir}/libmate-desktop-2.so.*
 -
  %files devel
  %{_libdir}/libmate-desktop-2.so
- %{_libdir}/pkgconfig/*
- %{_includedir}/mate-desktop-2.0
+ %{_libdir}/pkgconfig/mate-desktop-2.0.pc
+ %{_includedir}/mate-desktop-2.0/
  %doc %{_datadir}/gtk-doc/html/mate-desktop