[mate-vfs/f17] add comment to files section
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Thu Aug 16 13:05:55 UTC 2012
commit b3f14404c8ea27cce0f476dc69af5bdef66e3a4f
Author: raveit65 <chat-to-me at raveit.de>
Date: Thu Aug 16 15:05:52 2012 +0200
add comment to files section
.gitignore | 1 +
mate-vfs-1.4.0-browser_default.patch | 20 +++
mate-vfs-1.4.0-ignore-certain-mountpoints.patch | 11 ++
mate-vfs-1.4.0-mailto-command.patch | 11 ++
mate-vfs-1.4.0-modules-conf.patch | 10 ++
mate-vfs-1.4.0-utf8-mounts.patch | 31 ++++
mate-vfs.spec | 182 +++++++++++++++++++++++
sources | 1 +
8 files changed, 267 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..7ddbc4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/mate-vfs-1.4.0.tar.xz
diff --git a/mate-vfs-1.4.0-browser_default.patch b/mate-vfs-1.4.0-browser_default.patch
new file mode 100644
index 0000000..b11b269
--- /dev/null
+++ b/mate-vfs-1.4.0-browser_default.patch
@@ -0,0 +1,20 @@
+--- mate-vfs-2.8.2/schemas/desktop_mate_url_handlers.schemas.in.browser_default 2004-10-18 21:38:08.605885937 -0400
++++ mate-vfs-2.8.2/schemas/desktop_mate_url_handlers.schemas.in 2004-10-18 21:38:20.470253994 -0400
+@@ -153,7 +153,7 @@
+ <applyto>/desktop/mate/url-handlers/http/command</applyto>
+ <owner>mate</owner>
+ <type>string</type>
+- <default>epiphany %s</default>
++ <default>firefox %s</default>
+ <locale name="C">
+ <short>The handler for "http" URLs</short>
+ <long>The command used to handle "http" URLs, if enabled.</long>
+@@ -187,7 +187,7 @@
+ <applyto>/desktop/mate/url-handlers/https/command</applyto>
+ <owner>mate</owner>
+ <type>string</type>
+- <default>epiphany %s</default>
++ <default>firefox %s</default>
+ <locale name="C">
+ <short>The handler for "https" URLs</short>
+ <long>The command used to handle "https" URLs, if enabled.</long>
diff --git a/mate-vfs-1.4.0-ignore-certain-mountpoints.patch b/mate-vfs-1.4.0-ignore-certain-mountpoints.patch
new file mode 100644
index 0000000..266d598
--- /dev/null
+++ b/mate-vfs-1.4.0-ignore-certain-mountpoints.patch
@@ -0,0 +1,11 @@
+--- mate-vfs-2.20.0/libmatevfs/mate-vfs-hal-mounts.c.orig 2007-10-15 20:12:13.000000000 -0400
++++ mate-vfs-2.20.0/libmatevfs/mate-vfs-hal-mounts.c 2007-10-15 20:12:40.000000000 -0400
+@@ -643,6 +643,8 @@
+ "/tmp",
+ "/usr",
+ "/var",
++ "/var/tmp",
++ "/var/log/audit",
+ "/proc",
+ "/sbin",
+ NULL
diff --git a/mate-vfs-1.4.0-mailto-command.patch b/mate-vfs-1.4.0-mailto-command.patch
new file mode 100644
index 0000000..5ecef15
--- /dev/null
+++ b/mate-vfs-1.4.0-mailto-command.patch
@@ -0,0 +1,11 @@
+--- mate-vfs-2.15.91/schemas/desktop_mate_url_handlers.schemas.in.mailto-command 2006-08-10 16:23:54.000000000 -0400
++++ mate-vfs-2.15.91/schemas/desktop_mate_url_handlers.schemas.in 2006-08-10 16:24:14.000000000 -0400
+@@ -255,7 +255,7 @@
+ <applyto>/desktop/mate/url-handlers/mailto/command</applyto>
+ <owner>mate</owner>
+ <type>string</type>
+- <default>evolution %s</default>
++ <default>evolution --component=mail %s</default>
+ <locale name="C">
+ <short>The handler for "mailto" URLs</short>
+ <long>The command used to handle "mailto" URLs, if enabled.</long>
diff --git a/mate-vfs-1.4.0-modules-conf.patch b/mate-vfs-1.4.0-modules-conf.patch
new file mode 100644
index 0000000..b9ab5ff
--- /dev/null
+++ b/mate-vfs-1.4.0-modules-conf.patch
@@ -0,0 +1,10 @@
+--- gnome-vfs-2.9.90/modules/default-modules.conf.modules-conf 2005-01-10 11:22:41.000000000 -0500
++++ gnome-vfs-2.9.90/modules/default-modules.conf 2005-01-31 10:05:54.986703000 -0500
+@@ -43,3 +43,7 @@
+ ssh: sftp
+
+ tar: tar
++
++favorites: desktop
++
++start-here: desktop
diff --git a/mate-vfs-1.4.0-utf8-mounts.patch b/mate-vfs-1.4.0-utf8-mounts.patch
new file mode 100644
index 0000000..a2e38f9
--- /dev/null
+++ b/mate-vfs-1.4.0-utf8-mounts.patch
@@ -0,0 +1,31 @@
+
+ mate-vfs-daemon reads /proc/mounts at startup and uses HAL via
+ libhal_drive_from_device_file() in multiple places in mate-vfs-hal-mounts.c
+
+ Strings in DBUS must be valid UTF8. If the device path is not valid UTF8,
+ dbus_connection_send() will cause a disconnect of the caller and an exit.
+
+ Threfore if the device path contains invalid utf8, mate-vfs-daemon will fail
+ to start. If that happens during a session, mate-vfs-daemon will be restarted
+ by any mate application wich cause a lot of start/stop of mate-vfs-daemon.
+
+ The following patch simply ensures that we use valid utf8 for device path to
+ avoid problems with hal/dbus.
+
+ Olivier Fourdan <ofourdan at redhat.com>
+
+ mate-vfs-volume-monitor-daemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff -up mate-vfs-2.16.2/libmatevfs/mate-vfs-volume-monitor-daemon.c.utf8-mount mate-vfs-2.16.2/libmatevfs/mate-vfs-volume-monitor-daemon.c
+--- mate-vfs-2.16.2/libmatevfs/mate-vfs-volume-monitor-daemon.c.utf8-mount 2009-07-07 06:10:24.000000000 -0400
++++ mate-vfs-2.16.2/libmatevfs/mate-vfs-volume-monitor-daemon.c 2009-07-07 06:10:34.000000000 -0400
+@@ -874,7 +874,7 @@ create_vol_from_mount (MateVFSVolumeMon
+ vol = g_object_new (MATE_VFS_TYPE_VOLUME, NULL);
+
+ vol->priv->volume_type = MATE_VFS_VOLUME_TYPE_MOUNTPOINT;
+- vol->priv->device_path = g_strdup (mount->device_path);
++ vol->priv->device_path = make_utf8 (mount->device_path);
+ vol->priv->unix_device = 0; /* Caller must fill in. */
+ vol->priv->activation_uri = mate_vfs_get_uri_from_local_path (mount->mount_path);
+ vol->priv->filesystem_type = g_strdup (mount->filesystem_type);
diff --git a/mate-vfs.spec b/mate-vfs.spec
new file mode 100644
index 0000000..271df27
--- /dev/null
+++ b/mate-vfs.spec
@@ -0,0 +1,182 @@
+%global po_package mate-vfs-2.0
+
+Summary: The MATE virtual file-system libraries
+Name: mate-vfs
+Version: 1.4.0
+Release: 10%{?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(post): mate-conf
+Requires(pre): mate-conf
+Requires(preun): mate-conf
+
+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
+
+Patch0: mate-vfs-1.4.0-modules-conf.patch
+
+# Default
+Patch1: mate-vfs-1.4.0-browser_default.patch
+
+# RH bug #197868
+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
+
+# 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
+
+%description
+MATE VFS is the MATE virtual file system. It is the foundation of
+the Caja file manager. It provides a modular architecture and
+ships with several modules that implement support for file systems,
+http, ftp, and others. It provides a URI-based API, back end
+supporting asynchronous file operations, a MIME type manipulation
+library, and other features.
+
+%package devel
+Summary: Libraries and include files for developing MATE VFS applications
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+This package provides the necessary development libraries for writing
+MATE VFS modules and applications that use the MATE VFS APIs.
+
+%package smb
+Summary: Windows file share support for mate-vfs
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description smb
+This package provides support for reading and writing files on windows
+shares (SMB) to applications using MATE VFS.
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .modules-conf
+%patch1 -p1 -b .mailto-command
+%patch2 -p1 -b .browser_default
+%patch3 -p1 -b .ignore-certain-mount-points
+%patch4 -p1 -b .utf8-mounts
+
+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
+fi
+
+export CPPFLAGS="-I/usr/include/cdda"
+
+%configure \
+ --enable-daemon \
+ --disable-static
+
+
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new && \
+touch -r AUTHORS AUTHORS.new && \
+mv AUTHORS.new AUTHORS
+
+make %{?_smp_mflags}
+
+
+%install
+export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+%find_lang %{name}
+
+
+%post
+/sbin/ldconfig
+%mateconf_schema_upgrade system_http_proxy system_dns_sd system_smb desktop_mate_url_handlers desktop_default_applications
+
+%pre
+%mateconf_schema_prepare system_http_proxy system_dns_sd system_smb desktop_mate_url_handlers desktop_default_applications
+
+%preun
+%mateconf_schema_remove system_http_proxy system_dns_sd system_smb desktop_mate_url_handlers desktop_default_applications
+
+%postun -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%doc AUTHORS COPYING COPYING.LIB NEWS README
+%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}/*
+%{_libexecdir}/*
+%{_libdir}/*.so.*
+%exclude %{_libdir}/mate-vfs-2.0/modules/libsmb.so
+# these .so-files are plugins for mate-vfs
+%{_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
+%{_includedir}/*
+%{_datadir}/gtk-doc/html/mate-vfs-2.0/*
+
+%files smb
+%{_libdir}/mate-vfs-2.0/modules/libsmb.so
+%config(noreplace) %{_sysconfdir}/mate-vfs-2.0/modules/smb-module.conf
+
+%changelog
+* Thu Aug 16 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-10
+- add comment to files section
+
+* Tue Aug 07 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-9
+- convert authors file to utf8
+
+* Tue Aug 07 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-8
+- remove hal bits
+- fix rpm scriptlets
+
+* Tue Aug 07 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-7
+- add BuildRequires: libxml2-devel
+- change patch names to mate
+- add isa tags
+- remove unnecessaries BuildRequires: intltool gtk-doc
+
+* Thu Jul 26 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-6
+- initial build for fedora
+- remove unnecessary BuildRequires
+
+* Sun Dec 25 2011 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.1.0-1
+- mate-vfs.spec based on gnome-vfs2-2.24.4-6.fc16 spec
diff --git a/sources b/sources
index e69de29..de4d55c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+1e9d9384b739741c979fd834170f9214 mate-vfs-1.4.0.tar.xz
More information about the scm-commits
mailing list