- merged from DEVEL

Changed files:
    gnome-vfs2-defaults-path.patch -> 1.2
    gnome-vfs2.spec -> 1.139

diff --git a/gnome-vfs2-defaults-path.patch b/gnome-vfs2-defaults-path.patch
index d114fba1bba536485aaef0913ed6f9badab838a1..bcfb4ad0d59869b9631c6d95cb38df8e7ca79f50 100644 (file)
--- a/gnome-vfs2-defaults-path.patch
+++ b/gnome-vfs2-defaults-path.patch
@@ -1,12 +1,24 @@
-diff -Nuard gnome-vfs-2.8.3.orig/libgnomevfs/eggdirfuncs.c gnome-vfs-2.8.3/libgnomevfs/eggdirfuncs.c
---- gnome-vfs-2.8.3.orig/libgnomevfs/eggdirfuncs.c     2004-12-08 15:10:12.768163792 +0100
-+++ gnome-vfs-2.8.3/libgnomevfs/eggdirfuncs.c  2004-12-08 15:11:43.400385600 +0100
-@@ -106,7 +106,7 @@
-   data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
+diff -urN aa/gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c
+--- aa/gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c      2004-12-14 16:30:29.000000000 +0100
++++ gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c 2005-02-06 22:33:14.677240592 +0100
+@@ -150,7 +150,7 @@
  
-   if (!data_dirs || !data_dirs[0])
--    data_dirs = "/usr/local/share/:/usr/share/";
-+    data_dirs = "/usr/local/share/:/usr/share/gnome/:/usr/share/";
+       xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+       if (!xdg_data_dirs) {
+-              xdg_data_dirs = "/usr/local/share/:/usr/share/";
++              xdg_data_dirs = "/usr/local/share/:/usr/share/gnome/:/usr/share/";
+       }
+       
+       split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0);
+diff -urN aa/gnome-vfs-2.9.90/libgnomevfs/xdgmime.c gnome-vfs-2.9.90/libgnomevfs/xdgmime.c
+--- aa/gnome-vfs-2.9.90/libgnomevfs/xdgmime.c  2004-12-14 16:30:30.000000000 +0100
++++ gnome-vfs-2.9.90/libgnomevfs/xdgmime.c     2005-02-06 22:33:25.327621488 +0100
+@@ -207,7 +207,7 @@
  
-   data_dir_vector = g_strsplit (data_dirs, ":", 0);
+   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+   if (xdg_data_dirs == NULL)
+-    xdg_data_dirs = "/usr/local/share/:/usr/share/";
++    xdg_data_dirs = "/usr/local/share/:/usr/share/gnome/:/usr/share/";
+ 
+   ptr = xdg_data_dirs;
  

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index c0a41e102ca13693172cfd1a0dd6725d620ef7cf..9eeecfbce665358aab27430b4df592012649f699 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -5,44 +5,37 @@
 Summary:       GNOME2 - virtual file system
 Summary(pl):   GNOME2 - wirtualny system plików
 Name:          gnome-vfs2
-Version:       2.8.4
+Version:       2.10.0
 Release:       1
 License:       LGPL
 Group:         Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.8/gnome-vfs-%{version}.tar.bz2
-# Source0-md5: 42d3505e9ef9c26a7aae4e511b9b4c34
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.10/gnome-vfs-%{version}.tar.bz2
+# Source0-md5: bb9df65d6a77414bbde9f1bc429c9d97
 Source1:       %{name}-defaults.list
-Patch0:                %{name}-applnk.patch
-Patch1:                %{name}-application.patch
-Patch2:                %{name}-onlyshowin.patch
-Patch3:                %{name}-capplets-dir.patch
-Patch4:                %{name}-gnome2-dir.patch
-Patch5:                %{name}-categories.patch
-Patch6:                %{name}-hal.patch
-Patch7:                %{name}-defaults-path.patch
+Patch0:                %{name}-defaults-path.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.8.0.1
-BuildRequires: ORBit2-devel >= 1:2.12.0
+BuildRequires: GConf2-devel >= 2.10.0
+BuildRequires: ORBit2-devel >= 1:2.12.1
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bzip2-devel
 BuildRequires: cdparanoia-III-devel
-%{?with_hal:BuildRequires:     dbus-glib-devel >= 0.22-5}
+%{?with_hal:BuildRequires:     dbus-glib-devel >= 0.23}
 BuildRequires: docbook-dtd412-xml >= 1.0-10
 BuildRequires: fam-devel
 BuildRequires: flex
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.4.4
+BuildRequires: glib2-devel >= 1:2.6.2
 BuildRequires: gnome-common >= 2.8.0
 BuildRequires: gnome-doc-tools
 BuildRequires: gnome-mime-data-devel >= 2.4.1
-BuildRequires: gtk+2-devel >= 2:2.4.4
+BuildRequires: gtk+2-devel >= 2:2.6.2
 BuildRequires: gtk-doc >= 1.1
-%{?with_hal:BuildRequires:     hal-devel >= 0.4.0}
+%{?with_hal:BuildRequires:     hal-devel >= 0.4.7}
 BuildRequires: heimdal-devel
 BuildRequires: howl-devel >= 0.9.6-2
 BuildRequires: intltool >= 0.30
-BuildRequires: libbonobo-devel >= 2.6.1
+BuildRequires: libbonobo-devel >= 2.8.1
 BuildRequires: libsmbclient-devel >= 3.0
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.6.0
@@ -52,13 +45,13 @@ BuildRequires:      pkgconfig
 BuildRequires: popt-devel
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: zlib-devel
-Requires:      desktop-file-utils >= 0.7
-Requires:      gnome-vfs-menu-module >= 1.0-1
-%{?with_hal:Requires:  hal-libs >= 0.4.0}
+Requires:      desktop-file-utils >= 0.9
+%{?with_hal:Requires:  hal-libs >= 0.4.7}
 Requires:      howl-libs >= 0.9.6-2
-Requires:      libbonobo >= 2.6.1
-Requires:      shared-mime-info >= 0.14
+Requires:      libbonobo >= 2.8.1
+Requires:      shared-mime-info >= 0.15
 Obsoletes:     gnome-vfs-extras
+Obsoletes:     gnome-vfs2-vfolder-menu
 Conflicts:     gnome-vfs2-module-menu <= 0.8-1
 Conflicts:     libgnome < 2.5.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -74,10 +67,10 @@ Summary:    gnome-vfs2 - header files
 Summary(pl):   gnome-vfs2 - pliki nag³ówkowe
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      GConf2-devel >= 2.8.0.1
+Requires:      GConf2-devel >= 2.10.0
 Requires:      gtk-doc-common
 Requires:      howl-devel >= 0.9.6-2
-Requires:      libbonobo-devel >= 2.6.1
+Requires:      libbonobo-devel >= 2.8.1
 Requires:      openssl-devel >= 0.9.7d
 
 %description devel
@@ -98,30 +91,9 @@ This package contains static gnome-vfs2 libraries.
 %description static -l pl
 Pakiet ten zawiera biblioteki statyczne gnome-vfs2.
 
-%package vfolder-menu
-Summary:       gnome-vfs2 - vfolder based GNOME menu
-Summary(pl):   gnome-vfs2 - menu GNOME przy u¿yciu vfolder
-Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Provides:      gnome-vfs-menu-module = 1.0-1
-Obsoletes:     gnome-vfs2-module-menu
-
-%description vfolder-menu
-Vfolder based GNOME menu.
-
-%description vfolder-menu -l pl
-Menu GNOME przy u¿yciu vfolder.
-
 %prep
 %setup -q -n gnome-vfs-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p1
-%patch6 -p0
-%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -138,7 +110,6 @@ Menu GNOME przy u
 %else
        --disable-hal
 %endif
-
 %{__make} CFLAGS="%{rpmcflags} -DMOUNT_ARGUMENT=\\\"-s\\\""
 
 %install
@@ -149,18 +120,6 @@ rm -rf $RPM_BUILD_ROOT
        m4dir=%{_aclocaldir} \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-cp     $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/default-modules.conf \
-       default-modules.conf.tmp 
-# only menu    
-grep -E '(applications:|all-applications:|applications-all-users:)' \
-       default-modules.conf.tmp \
-       > $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/menu.conf 
-# all but menu 
-grep -Ev '(applications:|all-applications:|applications-all-users:)' \
-       default-modules.conf.tmp \
-       > $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/default-modules.conf 
-rm -f default-modules.conf.tmp 
-
 # no static modules
 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}
@@ -185,7 +144,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %{_sysconfdir}/gnome-vfs-2.0
-%exclude %{_sysconfdir}/gnome-vfs-2.0/modules/menu.conf
 %{_sysconfdir}/gconf/schemas/*
 %attr(755,root,root) %{_bindir}/gnomevfs-*
 %attr(755,root,root) %{_libdir}/gnome-vfs-daemon
@@ -211,7 +169,3 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-
-%files vfolder-menu
-%defattr(644,root,root,755)
-%{_sysconfdir}/gnome-vfs-2.0/modules/menu.conf