This commit was manufactured by cvs2git to create tag 'auto-th-gnome-

vfs2-2_13_92-2'.

Sprout from master 2005-10-19 17:36:54 UTC freetz <freetz@pld-linux.org> '- handle cdda://'
Cherrypick from unlabeled-1.1.2 2006-01-05 13:38:48 UTC Patryk Zawadzki <patrys@room-303.com> '- up to 2.13.3':
    gnome-vfs2-defaults.list -> 1.1.2.1
    gnome-vfs2-no_g_mime.patch -> 1.1.2.2
Cherrypick from unlabeled-1.164.2 2006-03-11 19:46:29 UTC freetz <freetz@pld-linux.org> '- fixed -devel Requires (thx pluto), rel.2':
    gnome-vfs2.spec -> 1.164.2.16
Delete:
    gnome-vfs2-defaults-path.patch

diff --git a/gnome-vfs2-defaults-path.patch b/gnome-vfs2-defaults-path.patch
deleted file mode 100644 (file)
index bcfb4ad..0000000
--- a/gnome-vfs2-defaults-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 @@
- 
-       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 @@
- 
-   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-defaults.list b/gnome-vfs2-defaults.list
index 8b3c034e2587bd07858dcef74b7392d68e46c456..a1ba0ac7148b9802ea71371f2da2e8872560261b 100644 (file)
--- a/gnome-vfs2-defaults.list
+++ b/gnome-vfs2-defaults.list
@@ -119,6 +119,6 @@ application/x-msexcel=gnumeric.desktop
 application/x-oleo=gnumeric.desktop
 text/x-comma-separated-values=gnumeric.desktop
 application/x-sylk=gnumeric.desktop
-application/pdf=gpdf.desktop
-application/postscript=ggv.desktop
+application/pdf=evince.desktop
+application/postscript=evince.desktop
 text/plain=gedit.desktop

diff --git a/gnome-vfs2-no_g_mime.patch b/gnome-vfs2-no_g_mime.patch
index fbaf03a6f2f39411244cd1525228e9a469197d35..b3dc6bef044c7b107a9a43db4d587ccdb786ef3f 100644 (file)
--- a/gnome-vfs2-no_g_mime.patch
+++ b/gnome-vfs2-no_g_mime.patch
@@ -1,12 +1,11 @@
-diff -aurN gnome-vfs-2.11.3.orig/configure.in gnome-vfs-2.11.3/configure.in
---- gnome-vfs-2.11.3.orig/configure.in 2005-06-30 11:17:20.000000000 +0200
-+++ gnome-vfs-2.11.3/configure.in      2005-07-03 17:07:33.000000000 +0200
-@@ -972,7 +972,7 @@
+--- gnome-vfs-2.13.3/configure.in.orig 2006-01-05 14:17:03.903057750 +0100
++++ gnome-vfs-2.13.3/configure.in      2006-01-05 14:17:15.427778000 +0100
+@@ -985,7 +985,7 @@
  dnl End of IPv6 checks
  dnl ==============================================================================
  
 -PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0)
 +PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED)
- LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS"
- LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $RESOLVER_LIBS"
+ LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
+ LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
  AC_SUBST(LIBGNOMEVFS_CFLAGS)

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index c25bfe6a805ed5c87556469f4ef0f5fc69d88180..49926633216dfd1ee5ea007c6fcadda86ef55658 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,37 +1,42 @@
-Summary:       GNOME2 - virtual file system
-Summary(pl):   GNOME2 - wirtualny system plików
+#
+# Conditional build
+%bcond_without gnome_mount     # enable gnome-mount support
+#
+Summary:       GNOME - virtual file system
+Summary(pl):   GNOME - wirtualny system plików
 Name:          gnome-vfs2
-Version:       2.12.1
+Version:       2.13.92
 Release:       2
 License:       LGPL v2+
 Group:         Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.12/gnome-vfs-%{version}.tar.bz2
-# Source0-md5: 95b0308d49aba17b9cb36c84f8467017
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.13/gnome-vfs-%{version}.tar.bz2
+# Source0-md5: faff1305378d5aa1ac37c13c0788866f
 Source1:       %{name}-defaults.list
 Patch0:                %{name}-no_g_mime.patch
 Patch1:                %{name}-fstab_edit_crash.patch
 Patch2:                %{name}-disable_cdda.patch
-Patch3:                %{name}-samba.patch
+Patch3:                %{name}-default_cdda_handler.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.12.0
 BuildRequires: ORBit2-devel >= 1:2.12.3
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: bzip2-devel
 BuildRequires: dbus-glib-devel >= 0.34
 BuildRequires: docbook-dtd412-xml >= 1.0-10
 BuildRequires: fam-devel
 BuildRequires: flex
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.6.2
+BuildRequires: glib2-devel >= 1:2.9.3
 BuildRequires: gnome-common >= 2.8.0
 BuildRequires: gnome-doc-tools
+%{?with_gnome_mount:BuildRequires:     gnome-mount-devel}
 BuildRequires: gtk+2-devel >= 2:2.6.3
 BuildRequires: gtk-doc >= 1.4
-BuildRequires: hal-devel >= 0.5.4
+BuildRequires: hal-devel >= 0.5.6
 BuildRequires: heimdal-devel >= 0.7
-BuildRequires: howl-devel >= 0.9.10
-BuildRequires: intltool >= 0.30
+BuildRequires: intltool >= 0.34.2
 BuildRequires: libbonobo-devel >= 2.10.1
 BuildRequires: libsmbclient-devel >= 3.0
 BuildRequires: libtool >= 2:1.5.14
@@ -43,59 +48,82 @@ BuildRequires:      popt-devel
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: zlib-devel
-Requires(post):        /sbin/ldconfig
 Requires(post,preun):  GConf2
-Requires:      hal-libs >= 0.5.4
-Requires:      howl-libs >= 0.9.10
-Requires:      libbonobo >= 2.10.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
+Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-GNOME2 Virtual File System library.
+GNOME Virtual File System.
 
 %description -l pl
-Biblioteka Wirtualnego Systemu Plików GNOME2.
+Wirtualny Systemu Plików GNOME.
+
+%package libs
+Summary:       gnome-vfs library
+Summary(pl):   Biblioteka gnome-vfs
+Group:         Development/Libraries
+Requires:      hal-libs >= 0.5.6
+Requires:      libbonobo >= 2.10.1
+
+%description libs
+This package contains gnome-vfs libraries.
+
+%description libs -l pl
+Pakiet zawiera biblioteki gnome-vfs.
 
 %package devel
-Summary:       gnome-vfs2 - header files
-Summary(pl):   gnome-vfs2 - pliki nag³ówkowe
+Summary:       gnome-vfs - header files
+Summary(pl):   gnome-vfs - pliki nag³ówkowe
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      avahi-glib-devel >= 0.6
+Requires:      dbus-glib-devel >= 0.34
 Requires:      GConf2-devel >= 2.12.0
 Requires:      gtk-doc-common
-Requires:      howl-devel >= 0.9.10
 Requires:      libbonobo-devel >= 2.10.1
 Requires:      openssl-devel >= 0.9.7d
 
 %description devel
-This package contains header files for gnome-vfs2 library.
+This package contains header files for gnome-vfs library.
 
 %description devel -l pl
-Pakiet ten zawiera pliki nag³ówkowe biblioteki gnome-vfs2.
+Pakiet ten zawiera pliki nag³ówkowe biblioteki gnome-vfs.
 
 %package static
-Summary:       gnome-vfs2 - static libraries
-Summary(pl):   gnome-vfs2 - biblioteki statyczne
+Summary:       gnome-vfs - static libraries
+Summary(pl):   gnome-vfs - biblioteki statyczne
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-This package contains static gnome-vfs2 libraries.
+This package contains static gnome-vfs libraries.
 
 %description static -l pl
-Pakiet ten zawiera biblioteki statyczne gnome-vfs2.
+Pakiet ten zawiera biblioteki statyczne gnome-vfs.
+
+%package apidocs
+Summary:       gnome-vfs API documetation
+Summary(pl):   Dokumentacja API gnome-vfs
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+gnome-vfs API documetation.
+
+%description apidocs -l pl
+Dokumentacja API gnome-vfs.
 
 %prep
 %setup -q -n gnome-vfs-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p0
+%patch3 -p1
 
 %build
 # force rebuild
@@ -105,10 +133,13 @@ touch libgnomevfs/GNOME_VFS_Daemon.idl
 %{__autoconf}
 %{__automake}
 %configure \
-       --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir} \
+       --disable-howl \
        --disable-schemas-install \
-       --enable-ipv6
+       --%{?with_gnome_mount:en}%{!?with_gnome_mount:dis}able-gnome-mount \
+       --enable-gtk-doc \
+       --enable-ipv6 \
+       --with-html-dir=%{_gtkdocdir}
+       
 %{__make}
 
 %install
@@ -134,7 +165,6 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/defaults.list
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 %gconf_schema_install desktop_default_applications.schemas
 %gconf_schema_install desktop_gnome_url_handlers.schemas
 %gconf_schema_install system_dns_sd.schemas
@@ -150,7 +180,8 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_uninstall system_smb.schemas
 %gconf_schema_uninstall system_storage.schemas
 
-%postun -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files -f gnome-vfs-2.0.lang
 %defattr(644,root,root,755)
@@ -164,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/system_storage.schemas
 %attr(755,root,root) %{_bindir}/gnomevfs-*
 %attr(755,root,root) %{_libdir}/gnome-vfs-daemon
-%attr(755,root,root) %{_libdir}/*.so.*.*
 %dir %{_libdir}/gnome-vfs-2.0
 %dir %{_libdir}/gnome-vfs-2.0/modules
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/*.so
@@ -172,6 +202,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/bonobo/monikers/*.so
 %{_desktopdir}/*.list
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.so.*.*
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
@@ -180,8 +214,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-vfs-module-2.0
 %{_libdir}/gnome-vfs-2.0/include
 %{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/gnome-vfs-2.0
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gnome-vfs-2.0