- fix build with current automake

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

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 85b18b91e9aac3eaa83c43898d6a77e55fd12d22..f279d8791c38b267c724d978c49ebfd68a2dcade 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,17 +1,24 @@
+#
+# 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.1
-Release:       2
+Version:       2.24.4
+Release:       13
 License:       LGPL v2+
 Group:         Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
-# Source0-md5: 100f9af16dc659e375ee8da45175a28d
+# 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
+Patch5:                %{name}-glib.patch
+Patch6:                am.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.22.0
 BuildRequires: ORBit2-devel >= 1:2.14.9
@@ -28,7 +35,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
@@ -40,6 +47,7 @@ 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}
@@ -63,7 +71,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.
@@ -119,6 +127,9 @@ Dokumentacja API gnome-vfs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 # force rebuild
@@ -131,6 +142,7 @@ touch libgnomevfs/GNOME_VFS_Daemon.idl
 %{__autoconf}
 %{__automake}
 %configure \
+       %{__enable_disable hal hal} \
        --disable-howl \
        --disable-schemas-install \
        --enable-gtk-doc \
@@ -149,11 +161,13 @@ 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
 
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr@ije,sr@ijekavian}
+
 %find_lang gnome-vfs-2.0
 
 %clean
@@ -221,7 +235,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