packages: nautilus/nautilus.spec - merged from DEVEL

[megabajt]

Author: megabajt                     Date: Wed Mar 31 06:17:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/nautilus:
   nautilus.spec (1.227 -> 1.228) 

---- Diffs:

================================================================
Index: packages/nautilus/nautilus.spec
diff -u packages/nautilus/nautilus.spec:1.227 packages/nautilus/nautilus.spec:1.228
--- packages/nautilus/nautilus.spec:1.227	Fri Feb 12 21:38:46 2010
+++ packages/nautilus/nautilus.spec	Wed Mar 31 08:17:29 2010
@@ -2,19 +2,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
@@ -24,16 +22,14 @@
 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
@@ -47,7 +43,7 @@
 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
@@ -86,8 +82,8 @@
 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
@@ -128,7 +124,9 @@
 %prep
 %setup -q
 
-sed -i -e 's#io##' po/LINGUAS
+sed -i -e 's#^en at shaw##' po/LINGUAS
+sed -i -e 's#^io##' po/LINGUAS
+rm -f po/en at shaw.po
 rm -f po/io.po
 
 %build
@@ -143,10 +141,9 @@
 %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}
 
@@ -230,15 +227,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.228  2010/03/31 06:17:29  megabajt
+- merged from DEVEL
+
+Revision 1.217.2.10  2010/03/29 18:43:28  megabajt
+- updated to 2.30.0
+
+Revision 1.217.2.9  2010/02/26 20:10:01  patrys
+- 2.29.91
+
 Revision 1.227  2010/02/12 20:38:46  sparky
 - dropped unused BR: docbook-utils
 
+Revision 1.217.2.8  2010/02/12 13:39:42  megabajt
+- updated to 2.29.90
+
 Revision 1.226  2010/02/11 20:12:31  megabajt
 - release 2
 
 Revision 1.225  2010/01/15 20:18:42  sparky
 - use preferred %{!?...} instead of %{?!...}
 
+Revision 1.217.2.7  2009/12/28 14:44:05  patrys
+- actually last version was 2.29.1
+
+Revision 1.217.2.6  2009/12/28 14:43:29  patrys
+- 2.29.1
+
 Revision 1.224  2009/12/16 12:46:36  patrys
 - 2.28.4
 
@@ -526,3 +541,4 @@
 
 Revision 1.164  2006/05/23 21:10:39  freetz
 - sync with stable branch, cut changelog
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nautilus/nautilus.spec?r1=1.227&r2=1.228&f=u