#
# Conditional build:
-%bcond_without hal # don't use hal
+%bcond_with hal # build with HAL support (HAL is deprecated)
#
-Summary: GNOME2 - virtual file system
-Summary(pl): GNOME2 - wirtualny system plików
+Summary: GNOME - virtual file system
+Summary(pl.UTF-8): GNOME - wirtualny system plików
Name: gnome-vfs2
-Version: 2.10.0
-Release: 2
-License: LGPL
+Version: 2.24.4
+Release: 13
+License: LGPL v2+
Group: Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.10/gnome-vfs-%{version}.tar.bz2
-# Source0-md5: bb9df65d6a77414bbde9f1bc429c9d97
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
+# Source0-md5: a05fab03eeef10a47dd156b758982f2e
Source1: %{name}-defaults.list
-Patch0: %{name}-defaults-path.patch
+Patch0: %{name}-no_g_mime.patch
+Patch1: %{name}-fstab_edit_crash.patch
+Patch2: %{name}-default_cdda_handler.patch
+Patch3: %{name}-headers-define.patch
+Patch4: %{name}-ac-libs.patch
+Patch5: %{name}-glib.patch
+Patch6: am.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.10.0
-BuildRequires: ORBit2-devel >= 1:2.12.1
+BuildRequires: GConf2-devel >= 2.22.0
+BuildRequires: ORBit2-devel >= 1:2.14.9
+BuildRequires: acl-devel >= 2.2.34
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: avahi-glib-devel >= 0.6.17
BuildRequires: bzip2-devel
-BuildRequires: cdparanoia-III-devel
-%{?with_hal:BuildRequires: dbus-glib-devel >= 0.23}
+BuildRequires: dbus-glib-devel >= 0.73
BuildRequires: docbook-dtd412-xml >= 1.0-10
BuildRequires: fam-devel
BuildRequires: flex
BuildRequires: gettext-devel
-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.6.2
-BuildRequires: gtk-doc >= 1.1
-%{?with_hal:BuildRequires: hal-devel >= 0.4.7}
+BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gtk-doc >= 1.8
+%{?with_hal:BuildRequires: hal-devel >= 0.5.9}
BuildRequires: heimdal-devel
-BuildRequires: howl-devel >= 0.9.10
-BuildRequires: intltool >= 0.30
-BuildRequires: libbonobo-devel >= 2.8.1
+BuildRequires: intltool >= 0.36.2
+BuildRequires: libselinux-devel
BuildRequires: libsmbclient-devel >= 3.0
BuildRequires: libtool >= 2:1.5.14
-BuildRequires: libxml2-devel >= 2.6.0
-BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: libxml2-devel >= 1:2.6.30
+BuildRequires: openssl-devel >= 0.9.8b
BuildRequires: perl-base
BuildRequires: pkgconfig
-BuildRequires: popt-devel
BuildRequires: rpm-build >= 4.1-10
+BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: sed >= 4.0
BuildRequires: zlib-devel
-Requires: desktop-file-utils >= 0.9
-%{?with_hal:Requires: hal-libs >= 0.4.7}
-Requires: howl-libs >= 0.9.10
-Requires: libbonobo >= 2.8.1
-Requires: shared-mime-info >= 0.15
+Requires(post,preun): GConf2
+Requires: %{name}-libs = %{version}-%{release}
+Requires: ORBit2 >= 1:2.14.9
+Requires: shared-mime-info >= 0.18
Obsoletes: gnome-vfs-extras
Obsoletes: gnome-vfs2-vfolder-menu
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
Conflicts: gnome-vfs2-module-menu <= 0.8-1
Conflicts: libgnome < 2.5.1
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.
+%description -l pl.UTF-8
+Wirtualny Systemu Plików GNOME.
+
+%package libs
+Summary: gnome-vfs library
+Summary(pl.UTF-8): Biblioteka gnome-vfs
+Group: Libraries
+%{?with_hal:Requires: hal-libs >= 0.5.9}
+
+%description libs
+This package contains gnome-vfs libraries.
+
+%description libs -l pl.UTF-8
+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.UTF-8): gnome-vfs - pliki nagłówkowe
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: GConf2-devel >= 2.10.0
+Requires: %{name}-libs = %{version}-%{release}
+Requires: GConf2-devel >= 2.22.0
+Requires: avahi-glib-devel >= 0.6.17
+Requires: dbus-glib-devel >= 0.73
Requires: gtk-doc-common
-Requires: howl-devel >= 0.9.10
-Requires: libbonobo-devel >= 2.8.1
-Requires: openssl-devel >= 0.9.7d
+Requires: libselinux-devel
+Requires: openssl-devel >= 0.9.8b
%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.
+%description devel -l pl.UTF-8
+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.UTF-8): 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.
+%description static -l pl.UTF-8
+Pakiet ten zawiera biblioteki statyczne gnome-vfs.
+
+%package apidocs
+Summary: gnome-vfs API documentation
+Summary(pl.UTF-8): Dokumentacja API gnome-vfs
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+gnome-vfs API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API gnome-vfs.
%prep
%setup -q -n gnome-vfs-%{version}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p0
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
+# force rebuild
+touch libgnomevfs/GNOME_VFS_Daemon.idl
+%{__gtkdocize}
+%{__glib_gettextize}
+%{__intltoolize}
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
%configure \
- --enable-gtk-doc \
- --with-html-dir=%{_gtkdocdir} \
+ %{__enable_disable hal hal} \
+ --disable-howl \
--disable-schemas-install \
+ --enable-gtk-doc \
--enable-ipv6 \
-%if %{with hal}
- --enable-hal
-%else
- --disable-hal
-%endif
-%{__make} CFLAGS="%{rpmcflags} -DMOUNT_ARGUMENT=\\\"-s\\\""
+ --with-html-dir=%{_gtkdocdir}
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_desktopdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
# 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}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/defaults.list
-install -d $RPM_BUILD_ROOT%{_datadir}/gnome/applications
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/applications/defaults.list
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr@ije,sr@ijekavian}
%find_lang gnome-vfs-2.0
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
-%gconf_schema_install
-
-%postun -p /sbin/ldconfig
+%gconf_schema_install desktop_default_applications.schemas
+%gconf_schema_install desktop_gnome_url_handlers.schemas
+%gconf_schema_install system_dns_sd.schemas
+%gconf_schema_install system_http_proxy.schemas
+%gconf_schema_install system_smb.schemas
+
+%preun
+%gconf_schema_uninstall desktop_default_applications.schemas
+%gconf_schema_uninstall desktop_gnome_url_handlers.schemas
+%gconf_schema_uninstall system_dns_sd.schemas
+%gconf_schema_uninstall system_http_proxy.schemas
+%gconf_schema_uninstall system_smb.schemas
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files -f gnome-vfs-2.0.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%{_sysconfdir}/gnome-vfs-2.0
-%{_sysconfdir}/gconf/schemas/*
-%attr(755,root,root) %{_bindir}/gnomevfs-*
-%attr(755,root,root) %{_libdir}/gnome-vfs-daemon
-%attr(755,root,root) %{_libdir}/*.so.*.*
+%{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas
+%{_sysconfdir}/gconf/schemas/desktop_gnome_url_handlers.schemas
+%{_sysconfdir}/gconf/schemas/system_dns_sd.schemas
+%{_sysconfdir}/gconf/schemas/system_http_proxy.schemas
+%{_sysconfdir}/gconf/schemas/system_smb.schemas
+%attr(755,root,root) %{_bindir}/gnomevfs-cat
+%attr(755,root,root) %{_bindir}/gnomevfs-copy
+%attr(755,root,root) %{_bindir}/gnomevfs-df
+%attr(755,root,root) %{_bindir}/gnomevfs-info
+%attr(755,root,root) %{_bindir}/gnomevfs-ls
+%attr(755,root,root) %{_bindir}/gnomevfs-mkdir
+%attr(755,root,root) %{_bindir}/gnomevfs-monitor
+%attr(755,root,root) %{_bindir}/gnomevfs-mv
+%attr(755,root,root) %{_bindir}/gnomevfs-rm
+%{_datadir}/dbus-1/services/gnome-vfs-daemon.service
+%{_desktopdir}/defaults.list
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnomevfs-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnomevfs-2.so.0
%dir %{_libdir}/gnome-vfs-2.0
%dir %{_libdir}/gnome-vfs-2.0/modules
-%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/*.so
-%{_libdir}/bonobo/servers/*
-%attr(755,root,root) %{_libdir}/bonobo/monikers/*.so
-%dir %{_datadir}/gnome/applications
-%{_datadir}/gnome/applications/defaults.list
+%attr(755,root,root) %{_libdir}/gnome-vfs-daemon
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libbzip2.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libcomputer.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libdns-sd.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libfile.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libftp.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libgzip.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libhttp.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libnetwork.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libnntp.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libsftp.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libsmb.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libtar.so
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libvfs-test.so
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libgnomevfs-2.so
%{_includedir}/gnome-vfs-2.0
%{_includedir}/gnome-vfs-module-2.0
%{_libdir}/gnome-vfs-2.0/include
-%{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/gnome-vfs-2.0
+%{_pkgconfigdir}/gnome-vfs-2.0.pc
+%{_pkgconfigdir}/gnome-vfs-module-2.0.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgnomevfs-2.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gnome-vfs-2.0