- libs deps moved to -libs, cosmetics

[packages/nautilus.git] / nautilus.spec

diff --git a/nautilus.spec b/nautilus.spec
index 6fab4755d4728c0912b0dce0ccea85d3b982cb87..e6cccc2e4a21bd4bc06c5e03e87135fb179bd749 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,48 +1,47 @@
-
 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.2.3
+Version:       2.4.1
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.2/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-am.patch
-Patch1:                %{name}-eel.patch
+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.2.0
-BuildRequires: ORBit2-devel >= 2.6.0
+BuildRequires: GConf2-devel >= 2.3.3
+BuildRequires: ORBit2-devel >= 2.8.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-activation-devel >= 2.2.1
 BuildRequires: cdparanoia-III-devel
 BuildRequires: docbook-utils >= 0.6.10
-BuildRequires: eel-devel >= 2.2.3
-BuildRequires: esound-devel >= 0.2.29
-BuildRequires: freetype-devel
+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.1
-BuildRequires: gnome-desktop-devel >= 2.2.0
-BuildRequires: gnome-vfs2-devel >= 2.2.1
-BuildRequires: gtk+2-devel >= 2.2.1
+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.10
-BuildRequires: libbonobo-devel >= 2.2.0
-BuildRequires: libbonoboui-devel >= 2.2.0
-BuildRequires: libgnome-devel >= 2.2.0
-BuildRequires: libgnomecanvas-devel >= 2.2.0
-BuildRequires: libgnomeui-devel >= 2.2.0
+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.2.4
-BuildRequires: libxml2-devel >= 2.5.3
-BuildRequires: pango-devel >= 1.2.1
+BuildRequires: librsvg-devel >= 2.4.0
+BuildRequires: libtool
+BuildRequires: libxml2-devel >= 2.5.10
+BuildRequires: pango-devel >= 1.2.5
 Requires(post):        GConf2
-Requires:      gnome-icon-theme >= 1.0.2
-Requires:      gnome-mime-data >= 2.0.1
-Requires:      eel >= 2.2.3
-Requires:      bonobo-activation >= 2.2.1
+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
@@ -63,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.
@@ -76,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
@@ -114,7 +115,6 @@ glib-gettextize --copy --force
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-
 %configure \
        --enable-static \
        --enable-hardware
@@ -125,8 +125,9 @@ glib-gettextize --copy --force
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       pkgconfigdir=%{_pkgconfigdir}
+       DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.a
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -142,20 +143,20 @@ 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-*
-%{_libdir}/bonobo/lib*.la
 %attr(755,root,root) %{_libdir}/bonobo/lib*.so
+%{_libdir}/bonobo/lib*.la
 %{_libdir}/bonobo/servers/*
-%{_datadir}/applications/*
 %{_datadir}/control-center-2.0/capplets/*.desktop
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/idl/*
-%{_datadir}/gnome/*
+%{_datadir}/gnome/network
 %{_datadir}/nautilus
+%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/X11/*
 %{_pixmapsdir}/nautilus
+%{_desktopdir}/*
 
 %files libs
 %defattr(644,root,root,755)
@@ -163,16 +164,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnautilus.so
-%{_libdir}/libnautilus.la
-%attr(755,root,root) %{_libdir}/libnautilus-adapter.so
-%{_libdir}/libnautilus-adapter.la
-%attr(755,root,root) %{_libdir}/libnautilus-private.so
-%{_libdir}/libnautilus-private.la
+%attr(755,root,root) %{_libdir}/libnautilus*.so
+%{_libdir}/libnautilus*.la
 %{_includedir}/libnautilus
 %{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%{_libdir}/bonobo/lib*.a