- small build fix

[packages/nautilus.git] / nautilus.spec

diff --git a/nautilus.spec b/nautilus.spec
index 5e0c7a1a040c74aca6ae4f26ae54c15e75af14f2..f009b111d7dfac930b7e3c38ddb4008cdebfc63c 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -3,8 +3,8 @@ Summary:        Nautilus is a file manager for the GNOME desktop environment
 Summary(pl):   Nautilus - pow³oka GNOME i zarz±dca plików
 Summary(pt_BR):        Nautilus é um gerenciador de arquivos para o GNOME
 Name:          nautilus
-Version:       2.1.2
-Release:       1
+Version:       2.1.3
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
@@ -15,39 +15,41 @@ BuildRequires:      GConf2-devel >= 1.2.1
 BuildRequires: ORBit2-devel >= 2.4.3
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-activation-devel >= 2.1.0
+BuildRequires: bonobo-activation-devel >= 2.1.0-3
 BuildRequires: cdparanoia-III-devel
 BuildRequires: docbook-utils >= 0.6.10
-BuildRequires: eel-devel >= 2.1.1-3
+BuildRequires: eel-devel >= 2.1.3
 BuildRequires: esound-devel >= 0.2.29
 BuildRequires: freetype-devel
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 2.0.6
 BuildRequires: gnome-desktop-devel >= 2.1.0
-BuildRequires: gnome-vfs2-devel >= 2.0.4-3
-BuildRequires: gtk+2-devel >= 2.0.6
+BuildRequires: gnome-vfs2-devel >= 2.1.3-3
+BuildRequires: gtk+2-devel >= 2.1.1
 BuildRequires: intltool
 BuildRequires: libart_lgpl-devel >= 2.3.10
-BuildRequires: libbonobo-devel >= 2.0.0
+BuildRequires: libbonobo-devel >= 2.1.0-3
 BuildRequires: libbonoboui-devel >= 2.0.3
-BuildRequires: libgnome >= 2.1.0
+BuildRequires: libgnome >= 2.1.1-2
 BuildRequires: libgnomecanvas >= 2.1.0
 BuildRequires: libgnomeui >= 2.1.1-3
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: librsvg-devel >= 2.1.0
 BuildRequires: libxml2-devel >= 2.4.24
-BuildRequires: pango-devel >= 1.0.4
+BuildRequires: pango-devel >= 1.1.2
 Requires(post):        GConf2
-Requires:      gnome-icon-theme
+Requires:      gnome-icon-theme >= 0.1.3
 Requires:      gnome-mime-data >= 2.0.1
-Requires:      eel >= 2.1.1-3
-Requires:      bonobo-activation >= 2.1.0
+Requires:      eel >= 2.1.3
+Requires:      bonobo-activation >= 2.1.0-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define                _sysconfdir     /etc/X11/GNOME2
+%define                _prefix                 /usr/X11R6
+%define                _mandir                 %{_prefix}/man
+%define                _sysconfdir             /etc/X11/GNOME2
+%define                _bonobo_dir             /usr/lib/bonobo
+%define                _bonobo_server_dir      %{_bonobo_dir}/servers
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -123,14 +125,16 @@ glib-gettextize --copy --force
        --enable-static \
        --enable-hardware
 
-%{__make}
+%{__make} bonobodir=%{_bonobo_dir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       pkgconfigdir=%{_pkgconfigdir}
+       pkgconfigdir=%{_pkgconfigdir} \
+       bonobodir=%{_bonobo_dir} \
+       serverdir=%{_bonobo_server_dir}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -141,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun        libs -p /sbin/ldconfig
 
 %post
-GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" /usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
+%gconf_schema_install
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -150,11 +154,12 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" /usr/X11R6/b
 %{_sysconfdir}/X11
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/nautilus-*
-%attr(755,root,root) %{_libdir}/bonobo/lib*.??
-%{_libdir}/bonobo/servers/*
+%attr(755,root,root) %{_bonobo_dir}/lib*.??
+%{_bonobo_server_dir}/*
 %{_datadir}/applications/*
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/idl/*
+%{_datadir}/gnome
 %{_datadir}/nautilus
 %{_pixmapsdir}/*.png
 %{_pixmapsdir}/nautilus
@@ -177,4 +182,4 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" /usr/X11R6/b
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%{_libdir}/bonobo/lib*.a
+%{_bonobo_dir}/lib*.a