- 2.15.1 (devel), 2.15.x GNOME platform build deps, removed patches already

  included in sources, remove unsupported locale

Changed files:
    gnome-vfs2.spec -> 1.172

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 4f31139b7c56b4aa72639949a1e0cda8865772ac..3cde56d3b8cc61417fdf0503ac94a3fcb4eb39fa 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,28 +1,16 @@
 Summary:       GNOME - virtual file system
 Summary(pl):   GNOME - wirtualny system plików
 Name:          gnome-vfs2
-Version:       2.14.1
-Release:       7
+Version:       2.15.1
+Release:       1
 License:       LGPL v2+
 Group:         Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.14/gnome-vfs-%{version}.tar.bz2
-# Source0-md5: d7ba7e667b46b5929b3e277a8b870868
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.15/gnome-vfs-%{version}.tar.bz2
+# Source0-md5: 1c38e19011530fbc28b52d2cfcab8e62
 Source1:       %{name}-defaults.list
 Patch0:                %{name}-no_g_mime.patch
 Patch1:                %{name}-fstab_edit_crash.patch
-Patch2:                %{name}-disable_cdda.patch
-Patch3:                %{name}-default_cdda_handler.patch
-Patch4:                %{name}-all_drives_for_computer.patch
-Patch5:                %{name}-df_not_null.patch
-Patch6:                %{name}-dont_eject_null.patch
-Patch7:                %{name}-dont_loop_if_no_anonymous_ftp.patch
-Patch8:                %{name}-fix_duplicate_declaration.patch
-Patch9:                %{name}-fix_parameters_for_desktop.patch
-Patch10:       %{name}-fix_volumes_sorting.patch
-Patch11:       %{name}-only_non_automounted_listed.patch
-Patch12:       %{name}-unaliase_mimetype.patch
-Patch13:       %{name}-smb_cache_lookup_fix.patch
-Patch14:       %{name}-ftp_ls_parse_fix.patch
+Patch2:                %{name}-default_cdda_handler.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: ORBit2-devel >= 1:2.14.0
@@ -35,10 +23,10 @@ BuildRequires:      docbook-dtd412-xml >= 1.0-10
 BuildRequires: fam-devel
 BuildRequires: flex
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.9.3
+BuildRequires: glib2-devel >= 1:2.11.1
 BuildRequires: gnome-common >= 2.12.0
 BuildRequires: gnome-doc-tools
-BuildRequires: gtk+2-devel >= 2:2.6.3
+BuildRequires: gtk+2-devel >= 2:2.9.1
 BuildRequires: gtk-doc >= 1.4
 BuildRequires: hal-devel >= 0.5.7
 BuildRequires: heimdal-devel >= 0.7
@@ -131,18 +119,6 @@ Dokumentacja API gnome-vfs.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
-%patch7 -p1
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-%patch12 -p1
-%patch13 -p0
-%patch14 -p1
 
 %build
 # force rebuild
@@ -175,6 +151,9 @@ install -d $RPM_BUILD_ROOT%{_desktopdir}
 rm -f $RPM_BUILD_ROOT%{_libdir}/{gnome-vfs-2.0/modules,bonobo/monikers}/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/filesystems/*.{la,a}
 
+# remove unsupported locale
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK
+
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/defaults.list
 
 %find_lang gnome-vfs-2.0