SPECS (DEVEL): nautilus.spec - dropped obsoleted mpg123-esd patch, ...

[freetz]

Author: freetz                       Date: Sun Aug 14 18:16:05 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- dropped obsoleted mpg123-esd patch, rel.2

---- Files affected:
SPECS:
   nautilus.spec (1.156.2.4 -> 1.156.2.5) 

---- Diffs:

================================================================
Index: SPECS/nautilus.spec
diff -u SPECS/nautilus.spec:1.156.2.4 SPECS/nautilus.spec:1.156.2.5
--- SPECS/nautilus.spec:1.156.2.4	Tue Aug  9 14:30:25 2005
+++ SPECS/nautilus.spec	Sun Aug 14 20:15:56 2005
@@ -1,23 +1,18 @@
 # $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.11.91
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.bz2
 # Source0-md5:	20b3d9551afc4f40fd5c90d2fc4dfd35
 Source1:	%{name}.PLD.readme
-Patch0:		%{name}-mpg123-esd.patch
-Patch1:		%{name}-includes.patch
-Patch2:		%{name}-desktop.patch
-Patch3:		%{name}-capplet.patch
+Patch0:		%{name}-includes.patch
+Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-capplet.patch
 URL:		http://nautilus.eazel.com/
 BuildRequires:	GConf2-devel >= 2.11.1
 BuildRequires:	ORBit2-devel >= 1:2.12.1
@@ -114,10 +109,9 @@
 
 %prep
 %setup -q
-%{?with_esd:%patch0 -p1}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__glib_gettextize}
@@ -168,9 +162,9 @@
 %dir %{_libdir}/nautilus/extensions-1.0
 %{_libdir}/bonobo/servers/*
 %{_datadir}/nautilus
-%{_sysconfdir}/gconf/schemas/apps_nautilus_preferences.schemas
-%{_pixmapsdir}/nautilus
 %{_desktopdir}/*
+%{_pixmapsdir}/nautilus
+%{_sysconfdir}/gconf/schemas/apps_nautilus_preferences.schemas
 
 %files libs
 %defattr(644,root,root,755)
@@ -193,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
 
================================================================

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