SPECS: nautilus.spec - merged from DEVEL, 2.12.0

aflinta aflinta at pld-linux.org
Tue Sep 6 15:55:52 CEST 2005 

Author: aflinta                      Date: Tue Sep  6 13:55:52 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL, 2.12.0

---- Files affected:
SPECS:
   nautilus.spec (1.156 -> 1.157) 

---- Diffs:

================================================================
Index: SPECS/nautilus.spec
diff -u SPECS/nautilus.spec:1.156 SPECS/nautilus.spec:1.157
--- SPECS/nautilus.spec:1.156	Fri Jun  3 01:02:31 2005
+++ SPECS/nautilus.spec	Tue Sep  6 15:55:47 2005
@@ -1,53 +1,47 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without	esd	# do not require esd daemon to play MP3 files
-#
 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.10.1
-Release:	5
+Version:	2.12.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/nautilus/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	976d725db15e901bc881dfb8c50145c1
+Source0:	http://ftp.gnome.org/pub/gnome/sources/nautilus/2.12/%{name}-%{version}.tar.bz2
+# Source0-md5:	f38ae8d066b822317d18efa1e2c543df
 Source1:	%{name}.PLD.readme
-Patch0:		%{name}-mpg123-esd.patch
-Patch1:		%{name}-includes.patch
-Patch2:		%{name}-desktop.patch
-Patch3:		%{name}-capplet.patch
-Patch4:		%{name}-pango_fonts_size.patch
+Patch0:		%{name}-includes.patch
+Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-capplet.patch
 URL:		http://nautilus.eazel.com/
-BuildRequires:	GConf2-devel >= 2.10.0
-BuildRequires:	ORBit2-devel >= 1:2.12.1
+BuildRequires:	GConf2-devel >= 2.12.0
+BuildRequires:	ORBit2-devel >= 1:2.12.3
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	cdparanoia-III-devel
 BuildRequires:	docbook-utils >= 0.6.10
-BuildRequires:	eel-devel >= 2.10.1
+BuildRequires:	eel-devel >= 2.12.0
 BuildRequires:	esound-devel >= 1:0.2.30
 BuildRequires:	freetype-devel >= 2.1.4
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-desktop-devel >= 2.10.0-2
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
+BuildRequires:	gnome-desktop-devel >= 2.12.0
+BuildRequires:	gnome-vfs2-devel >= 2.12.0
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libart_lgpl-devel >= 2.3.17
-BuildRequires:	libbonobo-devel >= 2.8.1
+BuildRequires:	libbonobo-devel >= 2.10.1
 BuildRequires:	libexif-devel >= 1:0.6.12
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnomeui-devel >= 2.12.0
 BuildRequires:	librsvg-devel >= 1:2.9.5-2
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 2.6.17
+BuildRequires:	libxml2-devel >= 2.6.21
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	startup-notification-devel >= 0.8
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
-Requires:	eel >= 2.10.1
-Requires:	gnome-icon-theme >= 2.10.0
-Requires:	gnome-vfs2 >= 2.10.0-2
+Requires:	eel >= 2.12.0
+Requires:	gnome-icon-theme >= 2.12.0
+Requires:	gnome-vfs2 >= 2.12.0
 Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	gstreamer-player-nautilus
 Obsoletes:	nautilus-gtkhtml
@@ -72,8 +66,8 @@
 Summary:	Nautilus libraries
 Summary(pl):	Biblioteki Nautilusa
 Group:		X11/Libraries
-Requires:	eel >= 2.10.0
-Requires:	libbonobo >= 2.8.1
+Requires:	eel >= 2.12.0
+Requires:	libbonobo >= 2.10.1
 
 %description libs
 Nautilus libraries.
@@ -87,7 +81,7 @@
 Summary(pt_BR):	Bibliotecas e arquivos para desenvolvimento com o nautilus
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	eel-devel >= 2.10.0
+Requires:	eel-devel >= 2.12.0
 Requires:	librsvg-devel >= 1:2.9.5-2
 
 %description devel
@@ -115,11 +109,9 @@
 
 %prep
 %setup -q
-%{?with_esd:%patch0 -p1}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__glib_gettextize}
@@ -140,6 +132,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
+# kill it - use banner instead
 install %{SOURCE1} .
 
 %find_lang %{name} --with-gnome --all-name
@@ -168,9 +162,9 @@
 %dir %{_libdir}/nautilus/extensions-1.0
 %{_libdir}/bonobo/servers/*
 %{_datadir}/nautilus
-%{_sysconfdir}/gconf/schemas/*
-%{_pixmapsdir}/nautilus
 %{_desktopdir}/*
+%{_pixmapsdir}/nautilus
+%{_sysconfdir}/gconf/schemas/apps_nautilus_preferences.schemas
 
 %files libs
 %defattr(644,root,root,755)
@@ -193,6 +187,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2005/09/06 13:55:47  aflinta
+- merged from DEVEL, 2.12.0
+
+Revision 1.156.2.8  2005/08/23 07:33:58  aflinta
+- 2.11.92
+
+Revision 1.156.2.7  2005/08/17 21:02:14  aflinta
+- rebuild with new cairo, rel. 3
+
+Revision 1.156.2.6  2005/08/16 20:52:15  paladine
+- fixed BR/R: gnome-vfs2
+
+Revision 1.156.2.5  2005/08/14 18:15:56  freetz
+- dropped obsoleted mpg123-esd patch, rel.2
+
+Revision 1.156.2.4  2005/08/09 12:30:25  paladine
+- updated to 2.11.91
+
+Revision 1.156.2.3  2005/07/26 06:13:41  freetz
+- 2.11.90, updated BRs/Rs
+
+Revision 1.156.2.2  2005/07/11 13:45:35  freetz
+- 2.11.4
+
+Revision 1.156.2.1  2005/07/03 18:48:50  freetz
+- 2.11.3, pango fonts hack removed (already solved), updated BRs
+
 Revision 1.156  2005/06/02 23:02:31  zbyniu
 - popt-devel is (indirect) required by libgnome-devel not here
 
================================================================

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

More information about the pld-cvs-commit mailing list