SPECS: nautilus.spec - updated to 2.24.0; merged changes from DEVEL

Sat Sep 27 16:48:00 CEST 2008

Author: megabajt                     Date: Sat Sep 27 14:48:00 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.24.0; merged changes from DEVEL

---- Files affected:
SPECS:
   nautilus.spec (1.207 -> 1.208) 

---- Diffs:

================================================================
Index: SPECS/nautilus.spec
diff -u SPECS/nautilus.spec:1.207 SPECS/nautilus.spec:1.208

--- SPECS/nautilus.spec:1.207	Sat Jul 12 18:36:48 2008
+++ SPECS/nautilus.spec	Sat Sep 27 16:47:54 2008
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditinal build:
+%bcond_without	apidocs		# disable API documentation
 %bcond_without	beagle		# disable beagle search
 %bcond_without	tracker		# disable tracker search
 #
@@ -8,32 +9,31 @@
 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.22.5.1
+Version:	2.24.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5:	a63596ca4cccddc970d695d62c05154a
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5:	b80c29aaefa3a22cdf58f644ef3019d0
 Source1:	%{name}.PLD.readme
-Patch0:		%{name}-capplet.patch
-Patch1:		%{name}-dnd-user-owned.patch
 URL:		http://www.gnome.org/projects/nautilus/
-BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	ORBit2-devel >= 1:2.14.8
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	docbook-utils >= 0.6.11
-BuildRequires:	eel-devel >= 2.22.1
+BuildRequires:	eel-devel >= 2.24.0
 BuildRequires:	esound-devel >= 1:0.2.37
 BuildRequires:	exempi-devel >= 1.99.5
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.16.1
-BuildRequires:	gnome-desktop-devel >= 2.22.0
-BuildRequires:	gtk+2-devel >= 2:2.12.9
-BuildRequires:	intltool >= 0.37.0
+BuildRequires:	glib2-devel >= 1:2.18.0
+BuildRequires:	gnome-desktop-devel >= 2.24.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	intltool >= 0.40.0
 %{?with_beagle:BuildRequires:	libbeagle-devel >= 0.3.0}
 BuildRequires:	libexif-devel >= 1:0.6.13
-BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	libgnomeui-devel >= 2.24.0
 BuildRequires:	librsvg-devel >= 1:2.22.0
 BuildRequires:	libtool
 %{?with_tracker:BuildRequires:	libtracker-devel}
@@ -47,9 +47,9 @@
 Requires(post,postun):	shared-mime-info
 Requires(post,preun):	GConf2
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	eel >= 2.22.1
-Requires:	gnome-icon-theme >= 2.22.0
-Requires:	gvfs >= 0.2.2
+Requires:	eel >= 2.24.0
+Requires:	gnome-icon-theme >= 2.24.0
+Requires:	gvfs >= 1.0.0
 Obsoletes:	gstreamer-player-nautilus
 Obsoletes:	nautilus-gtkhtml
 Obsoletes:	nautilus-media
@@ -88,8 +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:	glib2-devel >= 1:2.16.1
-Requires:	gtk+2-devel >= 2:2.12.9
+Requires:	glib2-devel >= 1:2.18.0
+Requires:	gtk+2-devel >= 2:2.14.0
 
 %description devel
 This package provides the necessary development libraries and include
@@ -114,15 +114,28 @@
 %description static -l pl.UTF-8
 Biblioteki statyczne Nautilusa.
 
+%package apidocs
+Summary:	Nautilus API documentation
+Summary(pl.UTF-8):	Dokumentacja API Nautilusa
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+Nautilus API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Nautilusa.
+
 %prep
 %setup -q
-%patch0 -p1
-#%patch1 -p0
 
-sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
-mv -f po/sr@{Latn,latin}.po
+sed -i -e 's#ca at valencia##' po/LINGUAS
+rm -f po/ca at valencia.po
+sed -i -e 's#io##' po/LINGUAS
+rm -f po/io.po
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -133,7 +146,9 @@
 %configure \
 	--enable-static \
 	%{?!with_beagle:--disable-beagle} \
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
 	%{?!with_tracker:--disable-tracker} \
+	--with-html-dir=%{_gtkdocdir} \
 	--disable-update-mimedb
 %{__make}
 
@@ -147,8 +162,6 @@
 # kill it - use banner instead
 install %{SOURCE1} .
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ca at valencia
-
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -185,6 +198,7 @@
 %{_datadir}/nautilus
 %{_desktopdir}/*.desktop
 %{_iconsdir}/hicolor/*/*/nautilus.*
+%{_mandir}/man1/nautilus*.1*
 %{_pixmapsdir}/nautilus
 %{_sysconfdir}/gconf/schemas/apps_nautilus_preferences.schemas
 
@@ -204,12 +218,37 @@
 %defattr(644,root,root,755)
 %{_libdir}/libnautilus-extension.a
 
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libnautilus-extension
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.208  2008/09/27 14:47:54  megabajt
+- updated to 2.24.0; merged changes from DEVEL
+
+Revision 1.202.2.9  2008/09/13 09:51:20  patrys
+- drop unused DND patch
+- drop X-Capplet (fix applnk, not GNOME)
+
+Revision 1.202.2.8  2008/09/04 11:06:14  patrys
+- 2.23.91
+
+Revision 1.202.2.7  2008/08/21 15:05:08  megabajt
+- updated to 2.23.90
+
+Revision 1.202.2.6  2008/08/05 14:02:05  patrys
+- 2.23.6.1
+
+Revision 1.202.2.5  2008/07/23 09:37:28  patrys
+- 2.23.5.1
+
 Revision 1.207  2008/07/12 16:36:48  megabajt
 - updated to 2.22.5.1
 
@@ -219,12 +258,24 @@
 Revision 1.205  2008/06/30 22:13:33  megabajt
 - updated to 2.22.4
 
+Revision 1.202.2.4  2008/06/17 10:14:08  megabajt
+- updated to 2.23.4
+
+Revision 1.202.2.3  2008/06/04 13:27:47  patrys
+- 2.23.3
+
 Revision 1.204  2008/06/01 14:23:40  megabajt
 - dropped ca at valencia
 - release 2
 
 Revision 1.203  2008-05-31 22:57:45  megabajt
 - updated to 2.22.3
+
+Revision 1.202.2.2  2008-05-14 14:34:23  patrys
+- 2.23.2
+
+Revision 1.202.2.1  2008-05-13 16:02:53  patrys
+- 2.23.1
 
 Revision 1.202  2008-04-08 15:06:16  megabajt
 - updated to 2.22.2
================================================================

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

