- fixed requirements

[packages/nautilus.git] / nautilus.spec

diff --git a/nautilus.spec b/nautilus.spec
index 0dd0352ada90457598627216cbaecdb875a27041..6fab4755d4728c0912b0dce0ccea85d3b982cb87 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,51 +1,50 @@
 
 Summary:       Nautilus is a file manager for the GNOME desktop environment
-Summary(pl):   Nautilus - pow³oka GNOME i menad¿er plików
+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.1
+Version:       2.2.3
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.2/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-am.patch
+Patch1:                %{name}-eel.patch
 URL:           http://nautilus.eazel.com/
-Requires:      gnome-mime-data >= 2.0.1
+BuildRequires: GConf2-devel >= 2.2.0
+BuildRequires: ORBit2-devel >= 2.6.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-activation-devel >= 1.0.3
+BuildRequires: bonobo-activation-devel >= 2.2.1
 BuildRequires: cdparanoia-III-devel
 BuildRequires: docbook-utils >= 0.6.10
-BuildRequires: eel-devel >= 2.1.0
+BuildRequires: eel-devel >= 2.2.3
 BuildRequires: esound-devel >= 0.2.29
 BuildRequires: freetype-devel
-BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 2.0.6
-BuildRequires: gnome-desktop-devel >= 2.1.0
-BuildRequires: gnome-vfs2-devel >= 2.0.4
-BuildRequires: gtk+2-devel >= 2.0.6
+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: intltool
 BuildRequires: libart_lgpl-devel >= 2.3.10
-BuildRequires: libbonobo-devel >= 2.0.0
-BuildRequires: libbonoboui-devel >= 2.0.3
-BuildRequires: libgnome >= 2.1.0
-BuildRequires: libgnomecanvas >= 2.1.0
-BuildRequires: libgnomeui >= 2.1.0
+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: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: librsvg-devel >= 2.1.0
-BuildRequires: libxml2-devel >= 2.4.24
-BuildRequires: ORBit2-devel >= 2.4.3
-BuildRequires: pango-devel >= 1.0.4
-Requires:      gnome-icon-theme
-Prereq:                /sbin/ldconfig
+BuildRequires: librsvg-devel >= 2.2.4
+BuildRequires: libxml2-devel >= 2.5.3
+BuildRequires: pango-devel >= 1.2.1
+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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define                _sysconfdir     /etc/X11/GNOME2
-
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -54,8 +53,8 @@ under the GNU General Public License and is a core component of the
 GNOME desktop project.
 
 %description -l pl
-GNU Nautilus jest mened¿erem plików i graficzn± pow³ok± dla GNOME.
-S³u¿y równie¿ bardzo dobrze jako przegl±darka stron WWW.
+GNU Nautilus jest programem do zarz±dzania plikami i graficzn± pow³ok±
+dla GNOME. S³u¿y równie¿ bardzo dobrze jako przegl±darka stron WWW.
 
 %description -l pt_BR
 O nautilus é um excelente gerenciador de arquivos para o GNOME.
@@ -106,12 +105,13 @@ Biblioteki statyczne Nautilusa.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 intltoolize --copy --force
 glib-gettextize --copy --force
-libtoolize --copy --force
-aclocal
+%{__libtoolize}
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 
@@ -133,26 +133,28 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" /usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%post
+%gconf_schema_install
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README
 %{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/X11
+%{_sysconfdir}/X11/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/nautilus-*
-%attr(755,root,root) %{_libdir}/bonobo/lib*.??
+%{_libdir}/bonobo/lib*.la
+%attr(755,root,root) %{_libdir}/bonobo/lib*.so
 %{_libdir}/bonobo/servers/*
 %{_datadir}/applications/*
+%{_datadir}/control-center-2.0/capplets/*.desktop
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/idl/*
+%{_datadir}/gnome/*
 %{_datadir}/nautilus
-%{_pixmapsdir}/*.png
 %{_pixmapsdir}/nautilus
 
 %files libs
@@ -162,11 +164,11 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" /usr/X11R6/b
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnautilus.so
-%attr(755,root,root) %{_libdir}/libnautilus.la
+%{_libdir}/libnautilus.la
 %attr(755,root,root) %{_libdir}/libnautilus-adapter.so
-%attr(755,root,root) %{_libdir}/libnautilus-adapter.la
+%{_libdir}/libnautilus-adapter.la
 %attr(755,root,root) %{_libdir}/libnautilus-private.so
-%attr(755,root,root) %{_libdir}/libnautilus-private.la
+%{_libdir}/libnautilus-private.la
 %{_includedir}/libnautilus
 %{_pkgconfigdir}/*.pc