- release 10

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

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 34b52e3c35ff996d94770abf09c32087d9016aa5..99554da1533723a85404557bfc060039a42cf2dc 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,8 +1,12 @@
+#
+# 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.24.4
-Release:       2
+Release:       10
 License:       LGPL v2+
 Group:         Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
@@ -12,6 +16,7 @@ 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.22.0
 BuildRequires: ORBit2-devel >= 1:2.14.9
@@ -28,7 +33,7 @@ BuildRequires:        gettext-devel
 BuildRequires: glib2-devel >= 1:2.18.0
 BuildRequires: gnome-common >= 2.20.0
 BuildRequires: gtk-doc >= 1.8
-BuildRequires: hal-devel >= 0.5.9
+%{?with_hal:BuildRequires:     hal-devel >= 0.5.9}
 BuildRequires: heimdal-devel
 BuildRequires: intltool >= 0.36.2
 BuildRequires: libselinux-devel
@@ -64,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.9
+%{?with_hal:Requires:  hal-libs >= 0.5.9}
 
 %description libs
 This package contains gnome-vfs libraries.
@@ -120,9 +125,7 @@ Dokumentacja API gnome-vfs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
-
-sed -i -e 's/^en@shaw//' po/LINGUAS
-rm -f po/en@shaw.po
+%patch4 -p1
 
 %build
 # force rebuild
@@ -135,6 +138,7 @@ touch libgnomevfs/GNOME_VFS_Daemon.idl
 %{__autoconf}
 %{__automake}
 %configure \
+       %{__enable_disable hal hal} \
        --disable-howl \
        --disable-schemas-install \
        --enable-gtk-doc \
@@ -153,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
 
@@ -225,7 +229,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnomevfs-2.so
-%{_libdir}/libgnomevfs-2.la
 %{_includedir}/gnome-vfs-2.0
 %{_includedir}/gnome-vfs-module-2.0
 %{_libdir}/gnome-vfs-2.0/include