- merged from DEVEL

Changed files:
    nautilus.spec -> 1.228

diff --git a/nautilus.spec b/nautilus.spec
index 3a6c5b16c278807741468ed609c5527365579d17..3f9a924f00db225efca6a90004f4b069db9da163 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,19 +1,17 @@
 #
 # Conditinal build:
 %bcond_without apidocs         # disable API documentation
-%bcond_without beagle          # disable beagle search
-%bcond_without tracker         # disable tracker search
 #
 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.28.4
-Release:       2
+Version:       2.30.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 28c97e0e5195ae1ad5101e8b703cbf52
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5: e09aea66166c0a90d09955bd4d2672be
 Source1:       %{name}.PLD.readme
 URL:           http://www.gnome.org/projects/nautilus/
 BuildRequires: GConf2-devel >= 2.24.0
@@ -23,16 +21,14 @@ BuildRequires:      dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
 BuildRequires: exempi-devel >= 1.99.5
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.20.0
-BuildRequires: gnome-desktop-devel >= 2.28.0
-BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: glib2-devel >= 1:2.24.0
+BuildRequires: gnome-desktop-devel >= 2.30.0
+BuildRequires: gtk+2-devel >= 2:2.20.0
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: intltool >= 0.40.1
-%{?with_beagle:BuildRequires:  libbeagle-devel >= 0.3.0}
 BuildRequires: libexif-devel >= 1:0.6.13
 BuildRequires: libselinux-devel
 BuildRequires: libtool
-%{?with_tracker:BuildRequires: libtracker-devel}
 BuildRequires: libunique-devel
 BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: pkgconfig
@@ -46,7 +42,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.3.2
+Requires:      gvfs >= 1.6.0
 Obsoletes:     gstreamer-player-nautilus
 Obsoletes:     nautilus-gtkhtml
 Obsoletes:     nautilus-media
@@ -85,8 +81,8 @@ Summary(pl.UTF-8):    Pliki nagłówkowe do tworzenia komponentów dla Nautilusa
 Summary(pt_BR.UTF-8):  Bibliotecas e arquivos para desenvolvimento com o nautilus
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.20.0
-Requires:      gtk+2-devel >= 2:2.16.0
+Requires:      glib2-devel >= 1:2.24.0
+Requires:      gtk+2-devel >= 2:2.20.0
 Requires:      libselinux-devel
 
 %description devel
@@ -127,7 +123,9 @@ Dokumentacja API Nautilusa.
 %prep
 %setup -q
 
-sed -i -e 's#io##' po/LINGUAS
+sed -i -e 's#^en@shaw##' po/LINGUAS
+sed -i -e 's#^io##' po/LINGUAS
+rm -f po/en@shaw.po
 rm -f po/io.po
 
 %build
@@ -142,10 +140,9 @@ rm -f po/io.po
 %configure \
        --enable-static \
        --enable-packagekit \
-       %{!?with_beagle:--disable-beagle} \
        --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
-       %{!?with_tracker:--disable-tracker} \
        --with-html-dir=%{_gtkdocdir} \
+       --disable-silent-rules \
        --disable-update-mimedb
 %{__make}