Author: paladine Date: Fri Mar 11 10:09:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL and updated to 2.10.0 - proper license - added some files to %%doc
---- Files affected: SPECS: nautilus.spec (1.140 -> 1.141) ---- Diffs: ================================================================ Index: SPECS/nautilus.spec diff -u SPECS/nautilus.spec:1.140 SPECS/nautilus.spec:1.141 --- SPECS/nautilus.spec:1.140 Sat Dec 11 01:28:35 2004 +++ SPECS/nautilus.spec Fri Mar 11 11:09:43 2005 @@ -1,51 +1,51 @@ # $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.8.2 +Version: 2.10.0 Release: 1 -License: GPL +License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2 -# Source0-md5: d5fdec9acc37181016e8424e96d663b8 +Source0: http://ftp.gnome.org/pub/gnome/sources/nautilus/2.10/%{name}-%{version}.tar.bz2 +# Source0-md5: b29a02be8733a82e002179e2e0f3fe83 Source1: %{name}.PLD.readme -Patch1: %{name}-mpg123-esd.patch -Patch2: %{name}-includes.patch -Patch3: %{name}-disable_medusa.patch -Patch4: %{name}-desktop.patch -Patch5: %{name}-libexif.patch -Patch6: %{name}-capplet.patch +Patch0: %{name}-mpg123-esd.patch +Patch1: %{name}-includes.patch +Patch2: %{name}-desktop.patch +Patch3: %{name}-capplet.patch URL: http://nautilus.eazel.com/ -BuildRequires: GConf2-devel >= 2.7.92 -BuildRequires: ORBit2-devel >= 1:2.11.2 -BuildRequires: autoconf +BuildRequires: GConf2-devel >= 2.10.0 +BuildRequires: ORBit2-devel >= 1:2.12.1 +BuildRequires: autoconf >= 2.54 BuildRequires: automake BuildRequires: cdparanoia-III-devel BuildRequires: docbook-utils >= 0.6.10 -BuildRequires: eel-devel >= 2.8.2 +BuildRequires: eel-devel >= 2.10.0 BuildRequires: esound-devel >= 1:0.2.30 BuildRequires: freetype-devel >= 2.1.4 BuildRequires: gettext-devel -BuildRequires: gnome-desktop-devel >= 2.7.92 -BuildRequires: gnome-vfs2-devel >= 2.8.2 +BuildRequires: gnome-desktop-devel >= 2.10.0 +BuildRequires: gnome-vfs2-devel >= 2.10.0 BuildRequires: intltool >= 0.31 -BuildRequires: libart_lgpl-devel >= 2.3.15 -BuildRequires: libbonoboui-devel >= 2.6.1 +BuildRequires: libart_lgpl-devel >= 2.3.17 +BuildRequires: libbonobo-devel >= 2.8.1 BuildRequires: libexif-devel >= 1:0.6.9 -BuildRequires: libgnomeui-devel >= 2.7.92 -BuildRequires: librsvg-devel >= 1:2.8.1 +BuildRequires: libgnomeui-devel >= 2.10.0 +BuildRequires: librsvg-devel >= 1:2.9.5 BuildRequires: libtool -BuildRequires: libxml2-devel >= 2.5.10 +BuildRequires: libxml2-devel >= 2.6.17 BuildRequires: popt-devel BuildRequires: pkgconfig -BuildRequires: startup-notification-devel >= 0.7 +BuildRequires: startup-notification-devel >= 0.8 Requires(post): GConf2 -Requires: gnome-icon-theme >= 2.7.90 -Requires: gnome-mime-data >= 2.4.0 -Requires: gnome-vfs2 >= 2.8.2 +Requires: gnome-icon-theme >= 2.10.0 +Requires: gnome-mime-data >= 2.4.2 +Requires: gnome-vfs2 >= 2.10.0 Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -67,8 +67,8 @@ Summary: Nautilus libraries Summary(pl): Biblioteki Nautilusa Group: X11/Libraries -Requires: eel >= 2.8.0 -Requires: libbonobo >= 2.6.2 +Requires: eel >= 2.10.0 +Requires: libbonobo >= 2.8.1 %description libs Nautilus libraries. @@ -82,8 +82,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.8.0 -Requires: librsvg-devel >= 1:2.8.1 +Requires: eel-devel >= 2.10.0 +Requires: librsvg-devel >= 1:2.9.5 %description devel This package provides the necessary development libraries and include @@ -110,12 +110,10 @@ %prep %setup -q -%{?with_esd:%patch1 -p1} +%{?with_esd:%patch0 -p1} +%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build glib-gettextize --copy --force @@ -126,7 +124,6 @@ %{__automake} %configure \ --enable-static - %{__make} %install @@ -136,12 +133,6 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.{la,a} - -install -d $RPM_BUILD_ROOT%{_datadir}/gnome/capplets -mv $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/*.desktop \ - $RPM_BUILD_ROOT%{_datadir}/gnome/capplets - rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no install %{SOURCE1} . @@ -158,16 +149,11 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc ChangeLog NEWS README nautilus.PLD.readme +%doc AUTHORS ChangeLog MAINTAINERS NEWS README THANKS nautilus.PLD.readme %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/nautilus-* -%attr(755,root,root) %{_libdir}/bonobo/lib*.so %dir %{_libdir}/nautilus %dir %{_libdir}/nautilus/extensions-1.0 %{_libdir}/bonobo/servers/* -%{_datadir}/gnome/capplets/*.desktop -%{_datadir}/gnome-2.0/ui/*.xml -%{_datadir}/idl/* %{_datadir}/nautilus %{_sysconfdir}/gconf/schemas/* %{_pixmapsdir}/nautilus @@ -194,6 +180,22 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.141 2005/03/11 10:09:43 paladine +- merged from DEVEL and updated to 2.10.0 +- proper license +- added some files to %%doc + +Revision 1.140.2.3 2005/03/01 13:13:15 aflinta +- up to version 2.9.92 + +Revision 1.140.2.2 2005/02/10 18:16:00 grzegol +- updated to 2.9.91 +- removed outdated libexif patch + +Revision 1.140.2.1 2005/02/07 01:21:56 grzegol +- updated to 2.9.90 +- removed outdated disable_medusa patch + Revision 1.140 2004/12/11 00:28:35 ankry - STBR requires integrer release: rel. 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nautilus.spec?r1=1.140&r2=1.141&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
