|
@@ -5,7 +5,6 @@
|
|
|
%define gamin_version 0.1.10
|
|
|
%define vine_menus_version 3.0
|
|
|
%define samba_version 3.2.5
|
|
|
-%define hal_version 0.5.11
|
|
|
##%define gnome_mount_version 0.8
|
|
|
%define avahi_version 0.6.23
|
|
|
%define dbus_version 1.4.0
|
|
@@ -19,7 +18,7 @@ Summary: The GNOME virtual file-system libraries.
|
|
|
Summary(ja): GNOME 仮想ファイルシステムライブラリ
|
|
|
Name: gnome-vfs2
|
|
|
Version: 2.24.4
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
License: LGPL
|
|
|
Group: System Environment/Libraries
|
|
|
Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
|
|
@@ -41,27 +40,41 @@ BuildRequires: popt-devel, bzip2-devel, ORBit2-devel, openjade
|
|
|
BuildRequires: pkgconfig
|
|
|
BuildRequires: gtk-doc >= %{gtkdoc_version}
|
|
|
BuildRequires: libsmbclient-devel >= %{samba_version}
|
|
|
-BuildRequires: hal-devel >= %{hal_version}
|
|
|
##BuildRequires: gnome-mount-devel >= %{gnome_mount_version}
|
|
|
BuildRequires: avahi-glib-devel >= %{avahi_version}
|
|
|
BuildRequires: dbus-devel >= %{dbus_version}
|
|
|
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
|
|
+BuildRequires: openssl-devel
|
|
|
BuildRequires: automake, autoconf
|
|
|
|
|
|
Patch3: gnome-vfs-2.9.90-modules-conf.patch
|
|
|
|
|
|
+# CVE-2009-2473 neon, gnome-vfs2 embedded neon: billion laughs DoS attack
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=518215
|
|
|
+Patch5: gnome-vfs-2.24.3-CVE-2009-2473.patch
|
|
|
+
|
|
|
+# RH bug #197868
|
|
|
+Patch6: gnome-vfs-2.15.91-mailto-command.patch
|
|
|
+
|
|
|
# send to upstream
|
|
|
Patch101: gnome-vfs-2.8.2-schema_about_for_upstream.patch
|
|
|
|
|
|
Patch201: gnome-vfs-2.8.1-console-mount-opt.patch
|
|
|
|
|
|
-# RH bug #197868
|
|
|
-Patch6: gnome-vfs-2.15.91-mailto-command.patch
|
|
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=333041
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=335241
|
|
|
Patch300: gnome-vfs-2.20.0-ignore-certain-mountpoints.patch
|
|
|
|
|
|
+# backported from upstream
|
|
|
+
|
|
|
+# gnome-vfs-daemon exits on dbus, and constantly restarted causing dbus/hal to hog CPU
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=486286
|
|
|
+Patch404: gnome-vfs-2.24.xx-utf8-mounts.patch
|
|
|
+
|
|
|
+# https://bugzilla.gnome.org/show_bug.cgi?id=435653
|
|
|
+Patch405: 0001-Add-default-media-application-schema.patch
|
|
|
+
|
|
|
# vine default
|
|
|
Patch1000: gnome-vfs2-2.22.0-vine.patch
|
|
|
|
|
@@ -134,6 +147,7 @@ GNOME VFS modules and applications that use the GNOME VFS APIs.
|
|
|
%setup -q -n gnome-vfs-%{version}
|
|
|
|
|
|
%patch3 -p1 -b .modules-conf
|
|
|
+%patch5 -p1 -b .CVE-2009-2473
|
|
|
%patch6 -p1 -b .mailto-command
|
|
|
|
|
|
# send to upstream
|
|
@@ -143,6 +157,10 @@ GNOME VFS modules and applications that use the GNOME VFS APIs.
|
|
|
|
|
|
%patch300 -p1 -b .ignore-certain-mount-points
|
|
|
|
|
|
+%patch404 -p1 -b .utf8-mounts
|
|
|
+
|
|
|
+%patch405 -p1 -b .default-media
|
|
|
+
|
|
|
# Vine
|
|
|
%patch1000 -p1 -b .browser_default
|
|
|
|
|
@@ -156,7 +174,7 @@ if pkg-config openssl ; then
|
|
|
LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
|
|
|
fi
|
|
|
|
|
|
-%configure --disable-gtk-doc --enable-hal
|
|
|
+%configure --disable-gtk-doc --disable-hal
|
|
|
|
|
|
export tagname=CC
|
|
|
make LIBTOOL=/usr/bin/libtool
|
|
@@ -267,6 +285,15 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.24.4-2
|
|
|
+- add BuildRequires: openssl-devel
|
|
|
+- remove BuildRequires: hal-devel
|
|
|
+- add configure option (--disable-hal)
|
|
|
+- add patches from fedora
|
|
|
+ - Patch5 (gnome-vfs-2.24.3-CVE-2009-2473.patch)
|
|
|
+ - Patch404 (gnome-vfs-2.24.xx-utf8-mounts.patch)
|
|
|
+ - Patch405 (0001-Add-default-media-application-schema.patch)
|
|
|
+
|
|
|
* Sat Oct 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.24.4-1
|
|
|
- new upstream release
|
|
|
- remove BuildRequires: gnome-mount-devel
|