[mate-file-manager] blah

[Dan Mashal]

commit 0c0030ed82cca0c41dc4aefe6f2b51e3b85719b1
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sat Feb 23 05:58:51 2013 -0800

    blah

 mate-file-manager.spec |   51 +++++++++++++++++++----------------------------
 1 files changed, 21 insertions(+), 30 deletions(-)
---
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index 49ba6e3..a8e7595 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -1,25 +1,19 @@
+%global commit e99cd96502845cce688ee4f545eb4a4f2edfb23a
 Name:       mate-file-manager
 Summary:    File manager for MATE
 Version:    1.5.3
-Release:    1%{?dist}
+Release:    4%{?dist}
 License:    GPLv2+ and LGPLv2+
 Group:      User Interface/Desktops
 URL:        http://mate-desktop.org
-Source0:    http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+Source0:    http://pub.mate-desktop.org/releases/1.5/releases/%{name}-%{version}.tar.xz
 
-# Fix 10 caja windows on login
-# https://bugzilla.redhat.com/show_bug.cgi?id=886029
-#This patch breaks other things
-#Patch0: ten_caja_windows_on_login.patch  
-#Latest upstream commits from github with various bugfixes
-Patch0:  mfm_commits_rollup.patch
 
 Requires:   gamin
 Requires:   filesystem
 Requires:   redhat-menus
-Requires:   gvfs
-Requires:   mate-icon-theme
-Requires:   gsettings-desktop-schemas
+
+Obsoletes: mate-file-manager-extensions < 1.5.3-4
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  mate-common
@@ -72,8 +66,8 @@ for developing caja extensions.
 
 %prep
 %setup -q
-%patch0 -p1
 NOCONFIGURE=1 ./autogen.sh
+
 %build
 %configure \
         --disable-static \
@@ -93,43 +87,39 @@ make %{?_smp_mflags} V=1
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make DESTDIR=%{buildroot} install
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/.icon-theme.cache
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0
 
 desktop-file-install									\
 	--delete-original								\
-	--dir=$RPM_BUILD_ROOT%{_datadir}/applications					\
-$RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+	--dir=%{buildroot}%{_datadir}/applications					\
+%{buildroot}%{_datadir}/applications/*.desktop
 
 
-%find_lang caja
+%find_lang %{name}
 
 
 %post
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+#/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor >& /dev/null || :
 
 %preun
 
 
 %postun
 if [ $1 -eq 0 ]; then
-  /bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-  /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+  /bin/touch --no-create %{_datadir}/icons/hicolor >& /dev/null || :
+  /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >& /dev/null || :
   /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+#/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >& /dev/null || :
 /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %post extensions -p /sbin/ldconfig
@@ -137,7 +127,7 @@ fi
 %postun extensions -p /sbin/ldconfig
 
 
-%files  -f caja.lang
+%files -f caja.lang
 %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB NEWS README
 %{_bindir}/caja
 %{_bindir}/caja-autorun-software
@@ -154,13 +144,11 @@ fi
 %{_libexecdir}/caja-convert-metadata
 %{_datadir}/mime/packages/caja.xml
 %{_datadir}/MateConf/gsettings/caja.convert
-
-%files extensions
 %{_libdir}/libcaja-extension.so.*
 %{_libdir}/girepository-1.0/*.typelib
+%{_datadir}/gtk-doc/html/libcaja-extension/
 
 %files devel
-%doc %{_datadir}/gtk-doc/html/libcaja-extension/
 %{_includedir}/caja
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
@@ -168,6 +156,9 @@ fi
 
 
 %changelog
+* Fri Feb 22 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.3-4
+- blah
+
 * Mon Feb 18 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.3-1
 - Update to latest upstream release.