- merged from DEVEL

Changed files:
    nautilus.spec -> 1.218

diff --git a/nautilus.spec b/nautilus.spec
index ca0223a7fbec8f35f63b690320f4ab4873c5a0ec..aa8c8aa07bf82d8cf0629b1c4890f92d6a3feeb7 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -8,12 +8,12 @@ Summary:      Nautilus is a file manager for the GNOME desktop environment
 Summary(pl.UTF-8):     Nautilus - powłoka GNOME i zarządca plików
 Summary(pt_BR.UTF-8):  Nautilus é um gerenciador de arquivos para o GNOME
 Name:          nautilus
-Version:       2.26.3
+Version:       2.28.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.26/%{name}-%{version}.tar.bz2
-# Source0-md5: e05f1b61c27f506451f7d46509631e7b
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5: 14d9464043848eddd0bd0d35bbe63415
 Source1:       %{name}.PLD.readme
 URL:           http://www.gnome.org/projects/nautilus/
 BuildRequires: GConf2-devel >= 2.24.0
@@ -44,7 +44,7 @@ Requires(post,postun):        shared-mime-info
 Requires(post,preun):  GConf2
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      gnome-icon-theme >= 2.26.0
-Requires:      gvfs >= 1.2.0
+Requires:      gvfs >= 1.3.2
 Obsoletes:     gstreamer-player-nautilus
 Obsoletes:     nautilus-gtkhtml
 Obsoletes:     nautilus-media
@@ -124,8 +124,6 @@ Dokumentacja API Nautilusa.
 %prep
 %setup -q
 
-sed -i -e 's#ca@valencia##' po/LINGUAS
-rm -f po/ca@valencia.po
 sed -i -e 's#io##' po/LINGUAS
 rm -f po/io.po
 
@@ -134,7 +132,7 @@ rm -f po/io.po
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -189,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/nautilus-autorun-software
 %attr(755,root,root) %{_bindir}/nautilus-connect-server
 %attr(755,root,root) %{_bindir}/nautilus-file-management-properties
+%attr(755,root,root) %{_libexecdir}/nautilus-convert-metadata
 %dir %{_libdir}/nautilus
 %dir %{_libdir}/nautilus/extensions-2.0
 %{_datadir}/mime/packages/*.xml