SPECS: nautilus.spec - 2.22.0 - merged from DEVEL

Tue Mar 11 16:13:49 CET 2008

Author: patrys                       Date: Tue Mar 11 15:13:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   nautilus.spec (1.198 -> 1.199) 

---- Diffs:

================================================================
Index: SPECS/nautilus.spec
diff -u SPECS/nautilus.spec:1.198 SPECS/nautilus.spec:1.199

--- SPECS/nautilus.spec:1.198	Wed Feb 13 07:32:03 2008
+++ SPECS/nautilus.spec	Tue Mar 11 16:13:43 2008
@@ -2,57 +2,54 @@
 #
 # Conditinal build:
 %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.20.0
-Release:	6
+Version:	2.22.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	3856ec2ffeba786d12f8f6622e398c33
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	0fcc02e92cfad239af27e0b47438c44c
 Source1:	%{name}.PLD.readme
-Patch0:		%{name}-includes.patch
-Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-capplet.patch
-Patch3:		%{name}-copy_label.patch
-Patch4:		%{name}-dnd-user-owned.patch
-Patch5:		%{name}-pl.patch
-Patch6:		%{name}-exempi-new-api.patch
-URL:		http://nautilus.eazel.com/
-BuildRequires:	GConf2-devel >= 2.20.0
-BuildRequires:	ORBit2-devel >= 1:2.14.7
+Patch3:		%{name}-dnd-user-owned.patch
+URL:		http://www.gnome.org/projects/nautilus/
+BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	ORBit2-devel >= 1:2.14.8
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	docbook-utils >= 0.6.11
-BuildRequires:	eel-devel >= 2.20.0
+BuildRequires:	eel-devel >= 2.21.92
 BuildRequires:	esound-devel >= 1:0.2.37
-BuildRequires:	exempi-devel
-BuildRequires:	freetype-devel >= 2.1.4
+BuildRequires:	exempi-devel >= 1.99.5
 BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	gnome-desktop-devel >= 2.20.0
-BuildRequires:	gnome-vfs2-devel >= 2.20.0
-BuildRequires:	intltool >= 0.35.5
-BuildRequires:	libart_lgpl-devel >= 2.3.19
+BuildRequires:	gtk+2-devel >= 2:2.12.5
+BuildRequires:	intltool >= 0.37.0
 %{?with_beagle:BuildRequires:	libbeagle-devel >= 0.3.0}
 BuildRequires:	libexif-devel >= 1:0.6.13
-BuildRequires:	libgnomeui-devel >= 2.20.0
-BuildRequires:	librsvg-devel >= 1:2.18.0
+BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	librsvg-devel >= 1:2.18.2
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.28
+%{?with_tracker:BuildRequires:	libtracker-devel}
+BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	startup-notification-devel >= 0.8
-Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	shared-mime-info
-Requires:	gnome-icon-theme >= 2.20.0
-Requires:	gnome-vfs2 >= 2.20.0
+Requires(post,preun):	GConf2
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	eel >= 2.22.0
+Requires:	gnome-icon-theme >= 2.20.0
+Requires:	gvfs
 Obsoletes:	gstreamer-player-nautilus
 Obsoletes:	nautilus-gtkhtml
 Obsoletes:	nautilus-media
@@ -78,8 +75,6 @@
 Summary:	Nautilus libraries
 Summary(pl.UTF-8):	Biblioteki Nautilusa
 Group:		X11/Libraries
-Requires:	eel >= 2.20.0
-Requires:	gnome-vfs2-libs >= 2.20.0
 
 %description libs
 Nautilus libraries.
@@ -93,9 +88,8 @@
 Summary(pt_BR.UTF-8):	Bibliotecas e arquivos para desenvolvimento com o nautilus
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	eel-devel >= 2.20.0
-Requires:	gnome-vfs2-devel >= 2.20.0
-Requires:	librsvg-devel >= 1:2.18.0
+Requires:	glib2-devel >= 1:2.15.6
+Requires:	gtk+2-devel >= 2:2.12.5
 
 %description devel
 This package provides the necessary development libraries and include
@@ -122,15 +116,11 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch4 -p0
-%patch5 -p1
-%patch6 -p1
+#%patch3 -p0
 
-sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
-mv -f po/sr\@{Latn,latin}.po
+sed -i -e s#sr at Latn#sr at latin# po/LINGUAS
+mv -f po/sr@{Latn,latin}.po
 
 %build
 %{__glib_gettextize}
@@ -142,13 +132,14 @@
 %{__automake}
 %configure \
 	--enable-static \
-	%{!?with_beagle:--disable-beagle} \
+	%{?!with_beagle:--disable-beagle} \
+	%{?!with_tracker:--disable-tracker} \
 	--disable-update-mimedb
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0
+install -d $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -181,10 +172,13 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README THANKS nautilus.PLD.readme
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/nautilus
+%attr(755,root,root) %{_bindir}/nautilus-autorun-software
+%attr(755,root,root) %{_bindir}/nautilus-connect-server
+%attr(755,root,root) %{_bindir}/nautilus-file-management-properties
 %dir %{_libdir}/nautilus
-%dir %{_libdir}/nautilus/extensions-1.0
-%{_libdir}/bonobo/servers/*
+%dir %{_libdir}/nautilus/extensions-2.0
+%{_libdir}/bonobo/servers/Nautilus_shell.server
 %{_datadir}/mime/packages/*.xml
 %{_datadir}/nautilus
 %{_desktopdir}/*.desktop
@@ -194,18 +188,19 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libnautilus-extension.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnautilus-extension.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnautilus*.so
-%{_libdir}/libnautilus*.la
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/libnautilus-extension.so
+%{_libdir}/libnautilus-extension.la
+%{_includedir}/nautilus
+%{_pkgconfigdir}/libnautilus-extension.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libnautilus-extension.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -213,15 +208,50 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.199  2008-03-11 15:13:43  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.192.2.11  2008-03-11 15:07:48  patrys
+- 2.22.0
+- patch1 applied upstream
+
+Revision 1.192.2.10  2008-02-28 19:10:11  megabajt
+- updated to 2.21.92
+- -beagle.patch applied upstream
+
+Revision 1.192.2.9  2008-02-13 16:29:37  megabajt
+- updated to 2.21.91
+- added tracker bcond and -beagle.patch which fixes build with recent libbeagle
+
 Revision 1.198  2008-02-13 06:32:03  qboosh
 - sorted BRs
 
+Revision 1.192.2.8  2008-02-12 15:10:37  patrys
+- BR: libtracker-devel
+
 Revision 1.197  2008-02-11 17:57:37  deejay1
 - s/beagle-devel/libbeagle-devel/
 
 Revision 1.196  2008-02-04 16:39:09  deejay1
 - rel. 6 for new beagle
 
+Revision 1.192.2.7  2008-02-01 21:03:59  megabajt
+- updated to 2.21.90
+
+Revision 1.192.2.6  2008-01-22 21:35:34  megabajt
+- updated to 2.21.6
+
+Revision 1.192.2.5  2008-01-14 21:08:51  megabajt
+- updated to 2.21.5
+
+Revision 1.192.2.4  2008-01-09 15:16:16  megabajt
+- updated to 2.21.2
+
+Revision 1.192.2.3  2008-01-04 17:19:59  megabajt
+- updated deps
+- more verbose files
+
 Revision 1.195  2008-01-04 13:21:48  megabajt
 - run autoheader
 
@@ -232,6 +262,12 @@
 Revision 1.193  2008-01-04 11:21:58  megabajt
 - release 4
 
+Revision 1.192.2.2  2007-12-22 21:41:12  patrys
+- R: gvfs
+
+Revision 1.192.2.1  2007-12-22 20:48:58  patrys
+- 2.21.1
+
 Revision 1.192  2007-11-10 23:31:45  megabajt
 - sr at Latn -> sr at latin; release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nautilus.spec?r1=1.198&r2=1.199&f=u

