[mate-vfs] Revert "remove requires mate-common"

[leigh123linux]

commit d7618785b01a8ea32eb2aff7839ca186d4765fbb
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 30 12:53:10 2012 +0000

    Revert "remove requires mate-common"
    
    This reverts commit a13ccb1516a7ed901c415ddbe2c3d139fb31984d.

 mate-vfs.spec |   94 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/mate-vfs.spec b/mate-vfs.spec
index da46780..15ccb49 100644
--- a/mate-vfs.spec
+++ b/mate-vfs.spec
@@ -1,53 +1,55 @@
 %global po_package mate-vfs-2.0
 
-Summary:         The MATE virtual file-system libraries
-Name:            mate-vfs
-Version:         1.4.0
-Release:         13%{?dist}
-License:         LGPLv2+ and GPLv2+
-# the daemon and the library are LGPLv2+
-# the modules are LGPLv2+ and GPLv2+
-Group:           System Environment/Libraries
-Source0:         http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-URL:             http://mate-desktop.org
-
-BuildRequires:   mate-conf-devel
-BuildRequires:   bzip2-devel
-BuildRequires:   libsmbclient-devel
-BuildRequires:   openssl-devel
-BuildRequires:   gamin-devel
-BuildRequires:   krb5-devel
-BuildRequires:   avahi-glib-devel
-BuildRequires:   dbus-glib-devel
-BuildRequires:   libacl-devel
-BuildRequires:   libselinux-devel
-BuildRequires:   keyutils-libs-devel
-BuildRequires:   mate-mime-data-devel
-BuildRequires:   mate-common
-BuildRequires:   libxml2-devel
-
-Requires(post):  mate-conf
-Requires(pre):   mate-conf
-Requires(preun): mate-conf
+Summary:			The MATE virtual file-system libraries
+Name:				mate-vfs
+Version:			1.4.0
+Release:			12%{?dist}
+License:			LGPLv2+ and GPLv2+
+					# the daemon and the library are LGPLv2+
+					# the modules are LGPLv2+ and GPLv2+
+Group:				System Environment/Libraries
+Source0:			http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+URL:				http://mate-desktop.org
+Requires:		mate-conf mate-common mate-corba
+Requires(post):		mate-conf
+Requires(pre):		mate-conf
+Requires(preun):	mate-conf
+Requires:		mate-conf
+Requires:		mate-corba
+
+BuildRequires:		mate-conf-devel
+BuildRequires:		bzip2-devel
+BuildRequires:		libsmbclient-devel
+BuildRequires:		openssl-devel
+BuildRequires:		gamin-devel
+BuildRequires:		krb5-devel
+BuildRequires:		avahi-glib-devel
+BuildRequires:		dbus-glib-devel
+BuildRequires:		libacl-devel
+BuildRequires:		libselinux-devel
+BuildRequires:		keyutils-libs-devel
+BuildRequires:		mate-mime-data-devel
+BuildRequires:		mate-common
+BuildRequires:		libxml2-devel
 
 # For gvfs-open
-Requires:       gvfs
+Requires:	gvfs
 
-Patch0:         mate-vfs-1.4.0-modules-conf.patch
+Patch0:		mate-vfs-1.4.0-modules-conf.patch
 
 # Default
-Patch1:         mate-vfs-1.4.0-browser_default.patch
+Patch1:		mate-vfs-1.4.0-browser_default.patch
 
 # RH bug #197868
-Patch2:         mate-vfs-1.4.0-mailto-command.patch
+Patch2:		mate-vfs-1.4.0-mailto-command.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=333041
 # https://bugzilla.redhat.com/show_bug.cgi?id=335241
-Patch3:         mate-vfs-1.4.0-ignore-certain-mountpoints.patch
+Patch3:		mate-vfs-1.4.0-ignore-certain-mountpoints.patch
 
 # gnome-vfs-daemon exits on dbus, and constantly restarted causing dbus/hal to hog CPU
 # https://bugzilla.redhat.com/show_bug.cgi?id=486286
-Patch4:         mate-vfs-1.4.0-utf8-mounts.patch
+Patch4:		mate-vfs-1.4.0-utf8-mounts.patch
 
 %description
 MATE VFS is the MATE virtual file system. It is the foundation of
@@ -87,15 +89,15 @@ NOCONFIGURE=1 ./autogen.sh
 
 %build
 if pkg-config openssl ; then
-        CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
-        LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
+	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
+	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
 
 export CPPFLAGS="-I/usr/include/cdda"
 
 %configure \
-        --enable-daemon \
-        --disable-static
+	--enable-daemon \
+	--disable-static
 
 
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -133,7 +135,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING COPYING.LIB NEWS README
-%{_sysconfdir}/mate-vfs-2.0/
+%dir %{_sysconfdir}/mate-vfs-2.0
+%dir %{_sysconfdir}/mate-vfs-2.0/modules
 %config(noreplace) %{_sysconfdir}/mate-vfs-2.0/modules/*.conf
 %exclude %{_sysconfdir}/mate-vfs-2.0/modules/smb-module.conf
 %{_bindir}/*
@@ -141,14 +144,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_libdir}/*.so.*
 %exclude %{_libdir}/mate-vfs-2.0/modules/libsmb.so
 # these .so-files are plugins for mate-vfs
-%{_libdir}/mate-vfs-2.0/
-%config %{_sysconfdir}/mateconf/schemas/*
+%{_libdir}/mate-vfs-2.0/modules
+%dir %{_libdir}/mate-vfs-2.0
+%config(noreplace) %{_sysconfdir}/mateconf/schemas/*
 %{_datadir}/dbus-1/services/mate-vfs-daemon.service
 
 %files devel
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
-%{_libdir}/mate-vfs-2.0/include/
+%{_libdir}/mate-vfs-2.0/include
 %{_includedir}/*
 %{_datadir}/gtk-doc/html/mate-vfs-2.0/*
 
@@ -157,10 +161,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %config(noreplace) %{_sysconfdir}/mate-vfs-2.0/modules/smb-module.conf
 
 %changelog
-* Tue Oct 30 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-13
-- remove mate-common requires plus duplicates
-- tidy up files section
-
 * Tue Aug 21 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.4.0-12
 - Syncing the branches from master