- release 10

[packages/gnome-vfs2.git] / gnome-vfs2.spec

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 025977d598c69ba4dc4b513e5833094b71873e30..99554da1533723a85404557bfc060039a42cf2dc 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,20 +1,25 @@
+#
+# Conditional build:
+%bcond_with    hal             # build with HAL support (HAL is deprecated)
+#
 Summary:       GNOME - virtual file system
 Summary(pl.UTF-8):     GNOME - wirtualny system plików
 Name:          gnome-vfs2
-Version:       2.18.0
-Release:       1
+Version:       2.24.4
+Release:       10
 License:       LGPL v2+
 Group:         Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.18/gnome-vfs-%{version}.tar.bz2
-# Source0-md5: fba4adfc57e2267405c9932e7515ef03
+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}-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
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.18.0.1
-BuildRequires: ORBit2-devel >= 1:2.14.7
+BuildRequires: GConf2-devel >= 2.22.0
+BuildRequires: ORBit2-devel >= 1:2.14.9
 BuildRequires: acl-devel >= 2.2.34
 BuildRequires: autoconf
 BuildRequires: automake
@@ -25,28 +30,31 @@ BuildRequires:      docbook-dtd412-xml >= 1.0-10
 BuildRequires: fam-devel
 BuildRequires: flex
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.12.11
-BuildRequires: gnome-common >= 2.12.0
-BuildRequires: gnome-doc-tools >= 0.7.2
+BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: gnome-common >= 2.20.0
 BuildRequires: gtk-doc >= 1.8
-BuildRequires: hal-devel >= 0.5.7.1
-BuildRequires: heimdal-devel >= 0.7
-BuildRequires: intltool >= 0.35.5
+%{?with_hal:BuildRequires:     hal-devel >= 0.5.9}
+BuildRequires: heimdal-devel
+BuildRequires: intltool >= 0.36.2
+BuildRequires: libselinux-devel
 BuildRequires: libsmbclient-devel >= 3.0
 BuildRequires: libtool >= 2:1.5.14
-BuildRequires: libxml2-devel >= 1:2.6.27
+BuildRequires: libxml2-devel >= 1:2.6.30
 BuildRequires: openssl-devel >= 0.9.8b
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
 Requires(post,preun):  GConf2
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      ORBit2 >= 1:2.14.7
+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)
@@ -61,7 +69,7 @@ Wirtualny Systemu Plików GNOME.
 Summary:       gnome-vfs library
 Summary(pl.UTF-8):     Biblioteka gnome-vfs
 Group:         Libraries
-Requires:      hal-libs >= 0.5.7.1
+%{?with_hal:Requires:  hal-libs >= 0.5.9}
 
 %description libs
 This package contains gnome-vfs libraries.
@@ -74,10 +82,11 @@ Summary:    gnome-vfs - header files
 Summary(pl.UTF-8):     gnome-vfs - pliki nagłówkowe
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      GConf2-devel >= 2.18.0.1
+Requires:      GConf2-devel >= 2.22.0
 Requires:      avahi-glib-devel >= 0.6.17
 Requires:      dbus-glib-devel >= 0.73
 Requires:      gtk-doc-common
+Requires:      libselinux-devel
 Requires:      openssl-devel >= 0.9.8b
 
 %description devel
@@ -116,6 +125,7 @@ Dokumentacja API gnome-vfs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
+%patch4 -p1
 
 %build
 # force rebuild
@@ -128,6 +138,7 @@ touch libgnomevfs/GNOME_VFS_Daemon.idl
 %{__autoconf}
 %{__automake}
 %configure \
+       %{__enable_disable hal hal} \
        --disable-howl \
        --disable-schemas-install \
        --enable-gtk-doc \
@@ -146,8 +157,8 @@ install -d $RPM_BUILD_ROOT%{_desktopdir}
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 # no static modules
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.{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
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/defaults.list
 
@@ -182,30 +193,51 @@ rm -rf $RPM_BUILD_ROOT
 %{_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-*
-%attr(755,root,root) %{_libdir}/gnome-vfs-daemon
-%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/*.so
-%{_datadir}/dbus-1/services/*.service
-%{_desktopdir}/*.list
+%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}/*.so.*.*
+%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-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
+%{_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)