- libs deps moved to -libs, cosmetics

[packages/nautilus.git] / nautilus.spec

diff --git a/nautilus.spec b/nautilus.spec
index 9197af4af5aff4ac660993b44b195898432653fb..e6cccc2e4a21bd4bc06c5e03e87135fb179bd749 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -2,46 +2,46 @@ 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.3.7
+Version:       2.4.1
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
-# Source0-md5: ea506ede0857efba37698159b8ef3dda
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5: 3e01d69809c4e6bb302c81075ed0be1e
 Patch0:                %{name}-vcategories.patch
+Patch1:                %{name}-mpg123-esd.patch
 URL:           http://nautilus.eazel.com/
 BuildRequires: GConf2-devel >= 2.3.3
-BuildRequires: ORBit2-devel >= 2.7.2
+BuildRequires: ORBit2-devel >= 2.8.0
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: cdparanoia-III-devel
 BuildRequires: docbook-utils >= 0.6.10
-BuildRequires: eel-devel >= 2.3.7
-BuildRequires: esound-devel >= 0.2.29
+BuildRequires: eel-devel >= 2.4.1
+BuildRequires: esound-devel >= 0.2.30
 BuildRequires: freetype-devel >= 2.1.4
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 2.2.2
-BuildRequires: gnome-desktop-devel >= 2.3.3
-BuildRequires: gnome-vfs2-devel >= 2.3.5
-BuildRequires: gtk+2-devel >= 2.2.2
+BuildRequires: glib2-devel >= 2.2.3
+BuildRequires: gnome-desktop-devel >= 2.3.90
+BuildRequires: gnome-vfs2-devel >= 2.4.0
+BuildRequires: gtk+2-devel >= 2.2.4
 BuildRequires: intltool
-BuildRequires: libart_lgpl-devel >= 2.3.12
-BuildRequires: libbonobo-devel >= 2.3.3
-BuildRequires: libbonoboui-devel >= 2.3.3
-BuildRequires: libgnome-devel >= 2.3.3
-BuildRequires: libgnomecanvas-devel >= 2.3.0
-BuildRequires: libgnomeui-devel >= 2.3.3
+BuildRequires: libart_lgpl-devel >= 2.3.15
+BuildRequires: libbonobo-devel >= 2.4.0
+BuildRequires: libbonoboui-devel >= 2.4.0
+BuildRequires: libgnome-devel >= 2.4.0
+BuildRequires: libgnomecanvas-devel >= 2.4.0
+BuildRequires: libgnomeui-devel >= 2.4.0
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: librsvg-devel >= 2.3.0
+BuildRequires: librsvg-devel >= 2.4.0
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.5.7
-BuildRequires: pango-devel >= 1.2.3
+BuildRequires: libxml2-devel >= 2.5.10
+BuildRequires: pango-devel >= 1.2.5
 Requires(post):        GConf2
-Requires:      eel >= 2.3.7
-Requires:      gnome-icon-theme >= 1.0.5
-Requires:      gnome-mime-data >= 2.3.0
-Requires:      libbonobo >= 2.3.3
+Requires:      gnome-icon-theme >= 1.0.9
+Requires:      gnome-mime-data >= 2.3.1
+Requires:      mpg123-esd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -62,6 +62,8 @@ O nautilus 
 Summary:       Nautilus libraries
 Summary(pl):   Biblioteki Nautilusa
 Group:         X11/Libraries
+Requires:      eel >= 2.4.1
+Requires:      libbonobo >= 2.4.0
 
 %description libs
 Nautilus libraries.
@@ -75,8 +77,8 @@ Summary(pl):  Pliki nag
 Summary(pt_BR):        Bibliotecas e arquivos para desenvolvimento com o nautilus
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}
-Requires:      eel-devel
-Requires:      librsvg-devel
+Requires:      eel-devel >= 2.4.0
+Requires:      librsvg-devel >= 2.4.0
 
 %description devel
 This package provides the necessary development libraries and include
@@ -104,6 +106,7 @@ Biblioteki statyczne Nautilusa.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 intltoolize --copy --force
@@ -112,7 +115,6 @@ glib-gettextize --copy --force
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-
 %configure \
        --enable-static \
        --enable-hardware
@@ -123,7 +125,7 @@ glib-gettextize --copy --force
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT 
+       DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.a
 
@@ -141,8 +143,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/X11/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/nautilus-*
 %attr(755,root,root) %{_libdir}/bonobo/lib*.so
@@ -153,6 +153,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/idl/*
 %{_datadir}/gnome/network
 %{_datadir}/nautilus
+%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/X11/*
 %{_pixmapsdir}/nautilus
 %{_desktopdir}/*