[mate-file-archiver] fix caja integration

[Dan Mashal]

commit b2ce7576a2afe0710cfd3a79c55495b42f40a4bd
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Jan 22 20:49:08 2013 -0800

    fix caja integration

 mate-file-archiver.spec |   73 +++++++++++++++++++++++------------------------
 1 files changed, 36 insertions(+), 37 deletions(-)
---
diff --git a/mate-file-archiver.spec b/mate-file-archiver.spec
index 1541c99..22c13b4 100644
--- a/mate-file-archiver.spec
+++ b/mate-file-archiver.spec
@@ -10,31 +10,24 @@ Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.
 
 BuildRequires:  mate-common
 BuildRequires:  desktop-file-utils
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(libcaja-extension)
-BuildRequires:  pkgconfig(mate-doc-utils)
-BuildRequires:  pkgconfig(mate-desktop-2.0)
-BuildRequires:  pkgconfig(gsettings-desktop-schemas)
-BuildRequires:  pkgconfig(sm)  
+BuildRequires:  glib2-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  mate-common
+BuildRequires:  mate-doc-utils
+BuildRequires:  mate-file-manager-devel
+BuildRequires:  mate-desktop-devel
+BuildRequires:  gsettings-desktop-schemas-devel
+BuildRequires:  libSM-devel
+BuildRequires:  rarian-compat
+BuildRequires:  rarian-devel
 
-Requires:   gsettings-desktop-schemas 
+Provides: engrampa
 
 %description
 Mate File Archiver is an application for creating and viewing archives files,
 such as tar or zip files.
 
 
-%package -n mate-file-manager-archiver
-Summary: File Roller extension for mate-file-manager
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description -n mate-file-manager-archiver
-This package contains the Mate File archiver extension for Mate file manger.
-It adds an item to the mate-file-manager contexst menu that lets you compress files
-or directories.
-
-
 %prep
 %setup -q
 NOCONFIGURE=1 ./autogen.sh
@@ -51,55 +44,61 @@ make V=1 %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-desktop-file-install --delete-original          \
-  --remove-category=MATE                        \
-  --add-category=X-Mate                         \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/engrampa.desktop
+desktop-file-install                              \
+  --remove-category="MATE"                        \
+  --add-category="X-Mate"                         \
+  --delete-original                               \
+  --dir %{buildroot}%{_datadir}/applications      \
+%{buildroot}%{_datadir}/applications/engrampa.desktop
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -name "*.la" -exec rm -f {} ';'
 
-
-%find_lang engrampa --with-gnome
+%find_lang engrampa
 
 %post
-/bin/touch --no-create %{_datadir}/icons/mate &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
 /usr/bin/update-desktop-database &> /dev/null || :
 
 
 %postun
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/mate &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &>/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-desktop-database &> /dev/null || :
 
 %posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &>/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 || :
 
 
 %files -f engrampa.lang
 %doc README COPYING NEWS AUTHORS
 %{_bindir}/engrampa
-%{_libexecdir}/engrampa/
-%{_datadir}/engrampa/
-%{_datadir}/mate/help/engrampa/
+%{_libexecdir}/engrampa
+%{_datadir}/engrampa
+%{_datadir}/mate/help/engrampa
 %{_datadir}/applications/engrampa.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/MateConf/gsettings/engrampa.convert
 %{_datadir}/glib-2.0/schemas/org.mate.engrampa.gschema.xml
-
-%files -n mate-file-manager-archiver
 %{_libdir}/caja/extensions-2.0/libcaja-engrampa.so
-
+%{_datadir}/omf/engrampa
 
 
 %changelog
+* Tue Jan 22 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-3
+- Update BRs
+- Convert back to old BR style
+- Get rid of separate package for shared library
+- Add provides field
+- Rebuild against latest version of mate-desktop
+- Update icon scriptlets
+
 * Thu Nov 22 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-2
 - Rebuild for f17