SPECS (AC-branch): nautilus.spec - merged from HEAD

baggins baggins at pld-linux.org
Tue May 16 00:27:49 CEST 2006 

Author: baggins                      Date: Mon May 15 22:27:49 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   nautilus.spec (1.161 -> 1.161.4.1) 

---- Diffs:

================================================================
Index: SPECS/nautilus.spec
diff -u SPECS/nautilus.spec:1.161 SPECS/nautilus.spec:1.161.4.1
--- SPECS/nautilus.spec:1.161	Mon Nov 28 19:03:32 2005
+++ SPECS/nautilus.spec	Tue May 16 00:27:44 2006
@@ -1,36 +1,40 @@
 # $Revision$, $Date$
+#
+# Conditinal build:
+%bcond_with	beagle		# enable beagle search
+#
 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.12.2
+Version:	2.14.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/nautilus/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	1c1304e458eda551da11ed8c52b1faa2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/nautilus/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	d8bad8b9141bc823c612abb7d460b725
 Source1:	%{name}.PLD.readme
 Patch0:		%{name}-includes.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-capplet.patch
 URL:		http://nautilus.eazel.com/
-BuildRequires:	GConf2-devel >= 2.12.0
-BuildRequires:	ORBit2-devel >= 1:2.12.3
+BuildRequires:	GConf2-devel >= 2.14.0
+BuildRequires:	ORBit2-devel >= 1:2.14.0
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
-BuildRequires:	cdparanoia-III-devel
+%{?with_beagle:BuildRequires:	beagle-devel >= 0.0.12}
 BuildRequires:	docbook-utils >= 0.6.10
-BuildRequires:	eel-devel >= 2.12.2
+BuildRequires:	eel-devel >= 2.14.1
 BuildRequires:	esound-devel >= 1:0.2.30
 BuildRequires:	freetype-devel >= 2.1.4
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-desktop-devel >= 2.12.1
-BuildRequires:	gnome-vfs2-devel >= 2.12.1
+BuildRequires:	gnome-desktop-devel >= 2.14.0
+BuildRequires:	gnome-vfs2-devel >= 2.14.0
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libart_lgpl-devel >= 2.3.17
-BuildRequires:	libbonobo-devel >= 2.10.1
+BuildRequires:	libbonobo-devel >= 2.14.0
 BuildRequires:	libexif-devel >= 1:0.6.12
-BuildRequires:	libgnomeui-devel >= 2.12.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	librsvg-devel >= 1:2.9.5-2
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.6.21
@@ -39,9 +43,9 @@
 BuildRequires:	startup-notification-devel >= 0.8
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
-Requires:	eel >= 2.12.2
-Requires:	gnome-icon-theme >= 2.12.0
-Requires:	gnome-vfs2 >= 2.12.1
+Requires(post,postun):	shared-mime-info
+Requires:	gnome-icon-theme >= 2.14.0
+Requires:	gnome-vfs2 >= 2.14.0
 Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	gstreamer-player-nautilus
 Obsoletes:	nautilus-gtkhtml
@@ -66,8 +70,8 @@
 Summary:	Nautilus libraries
 Summary(pl):	Biblioteki Nautilusa
 Group:		X11/Libraries
-Requires:	eel >= 2.12.1
-Requires:	libbonobo >= 2.10.1
+Requires:	eel >= 2.14.1
+Requires:	libbonobo >= 2.14.0
 
 %description libs
 Nautilus libraries.
@@ -81,7 +85,8 @@
 Summary(pt_BR):	Bibliotecas e arquivos para desenvolvimento com o nautilus
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	eel-devel >= 2.12.1
+Requires:	eel-devel >= 2.14.1
+Requires:	gnome-vfs2-devel >= 2.14.0
 Requires:	librsvg-devel >= 1:2.9.5-2
 
 %description devel
@@ -121,7 +126,9 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-static
+	--enable-static \
+	%{?!with_beagle:--disable-beagle} \
+	--disable-update-mimedb
 %{__make}
 
 %install
@@ -142,6 +149,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+umask 022
+update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
 %gconf_schema_install apps_nautilus_preferences.schemas
 %update_desktop_database_post
 
@@ -150,6 +159,10 @@
 
 %postun
 %update_desktop_database_postun
+if [ $1 = 0 ]; then
+	umask 022
+	update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
+fi
 
 %post	libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -161,6 +174,7 @@
 %dir %{_libdir}/nautilus
 %dir %{_libdir}/nautilus/extensions-1.0
 %{_libdir}/bonobo/servers/*
+%{_datadir}/mime/packages/*.xml
 %{_datadir}/nautilus
 %{_desktopdir}/*
 %{_pixmapsdir}/nautilus
@@ -187,6 +201,42 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161.4.1  2006/05/15 22:27:44  baggins
+- merged from HEAD
+
+Revision 1.163  2006/04/11 15:20:58  freetz
+- 2.14.1
+
+Revision 1.162  2006/04/02 09:08:01  freetz
+- merged from DEVEL
+
+Revision 1.161.2.9  2006/03/20 22:16:09  freetz
+- rel.3
+
+Revision 1.161.2.8  2006/03/19 18:39:18  freetz
+- beagle by default, rel.2
+
+Revision 1.161.2.7  2006/03/13 14:28:28  freetz
+- 2.14.0
+
+Revision 1.161.2.6  2006/03/04 15:42:24  freetz
+- bump gnome-vfs BR/R
+
+Revision 1.161.2.5  2006/02/27 18:39:58  freetz
+- 2.13.92
+
+Revision 1.161.2.4  2006/02/20 17:22:43  freetz
+- disable beagle by default (waitning for fixed mono on builders...), rel.2
+
+Revision 1.161.2.3  2006/02/13 11:06:34  freetz
+- 2.13.91
+
+Revision 1.161.2.2  2006/01/31 14:56:02  freetz
+- 2.13.90
+
+Revision 1.161.2.1  2006/01/29 20:43:46  freetz
+- 2.13.4, updated BR, (un)register mime in post/postun
+
 Revision 1.161  2005/11/28 18:03:32  freetz
 - 2.12.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nautilus.spec?r1=1.161&r2=1.161.4.1&f=u

More information about the pld-cvs-commit mailing list