- merged from DEVEL

Changed files:
    nautilus.spec -> 1.56

diff --git a/nautilus.spec b/nautilus.spec
index c1d1486111c11086042bb836a1ea13a57dfa5155..0dd0352ada90457598627216cbaecdb875a27041 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,64 +1,50 @@
+
 Summary:       Nautilus is a file manager for the GNOME desktop environment
-Summary(pl):   nautilus - pow³oka GNOME i menad¿er plików
+Summary(pl):   Nautilus - pow³oka GNOME i menad¿er plików
 Summary(pt_BR):        Nautilus é um gerenciador de arquivos para o GNOME
 Name:          nautilus
-Version:       1.0.6
-Release:       11
+Version:       2.1.1
+Release:       1
 License:       GPL
-Group:         X11/Window Managers
-Source0:       ftp://ftp.gnome.org/pub/GNOME/stable/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-applnk.patch
-Patch2:                %{name}-aclocal.patch
-Patch3:                %{name}-amfix.patch
-Patch4:                %{name}-bonobo-workaround.patch
-Patch5:                %{name}-cpp.patch
-Patch6:                %{name}-omf-encoding.patch
-Patch7:                %{name}-mozilla-profile-startup.patch
-Patch8:                %{name}-ac25.patch
-Patch9:                %{name}-dblib_fix.patch
-Patch10:       %{name}-ac_fix.patch
-Patch11:       %{name}-new_mozilla.patch
-Patch12:       %{name}-omf.patch
+Group:         X11/Applications
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+Patch0:                %{name}-am.patch
 URL:           http://nautilus.eazel.com/
-BuildRequires: GConf-devel >= 0.12
-BuildRequires: ORBit-devel >= 0.5.7
+Requires:      gnome-mime-data >= 2.0.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-devel >= 1.0.9
-BuildRequires: control-center-devel >= 1.3
-BuildRequires: eel-devel >= 1.0.2
-BuildRequires: esound-devel >= 0.2.22
-BuildRequires: freetype-devel >= 2.0.1
-BuildRequires: gdk-pixbuf-gnome-devel >= 0.10.0
+BuildRequires: bonobo-activation-devel >= 1.0.3
+BuildRequires: cdparanoia-III-devel
+BuildRequires: docbook-utils >= 0.6.10
+BuildRequires: eel-devel >= 2.1.0
+BuildRequires: esound-devel >= 0.2.29
+BuildRequires: freetype-devel
+BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: gettext-devel
-BuildRequires: gnome-applets
-BuildRequires: gnome-core-devel >= 1.4.0.4
-BuildRequires: gnome-http-devel
-BuildRequires: gnome-libs-devel >= 1.2.11
-BuildRequires: gnome-vfs-devel >= 1.0.3
-BuildRequires: gtk+-devel >= 1.2.9
-BuildRequires: imlib-devel >= 1.9.8
+BuildRequires: glib2-devel >= 2.0.6
+BuildRequires: gnome-desktop-devel >= 2.1.0
+BuildRequires: gnome-vfs2-devel >= 2.0.4
+BuildRequires: gtk+2-devel >= 2.0.6
 BuildRequires: intltool
+BuildRequires: libart_lgpl-devel >= 2.3.10
+BuildRequires: libbonobo-devel >= 2.0.0
+BuildRequires: libbonoboui-devel >= 2.0.3
+BuildRequires: libgnome >= 2.1.0
+BuildRequires: libgnomecanvas >= 2.1.0
+BuildRequires: libgnomeui >= 2.1.0
+BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: librsvg-devel >= 1.0.1
-BuildRequires: libtool
-BuildRequires: libxml-devel >= 1.8.10
-BuildRequires: medusa-devel >= 0.5.1
-BuildRequires: mozilla-devel >= 0.9.9
-BuildRequires: oaf-devel >= 0.6.5
-BuildRequires: scrollkeeper >= 0.1.4
-BuildRequires: xpdf >= 0.90
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): scrollkeeper
-Requires:      gnome-http
-Requires:      GConf >= 1.0.2
+BuildRequires: librsvg-devel >= 2.1.0
+BuildRequires: libxml2-devel >= 2.4.24
+BuildRequires: ORBit2-devel >= 2.4.3
+BuildRequires: pango-devel >= 1.0.4
+Requires:      gnome-icon-theme
+Prereq:                /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
-%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
-%define                _sysconfdir     /etc/X11/GNOME
+%define                _sysconfdir     /etc/X11/GNOME2
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -74,12 +60,23 @@ S
 %description -l pt_BR
 O nautilus é um excelente gerenciador de arquivos para o GNOME.
 
+%package libs
+Summary:       Nautilus libraries
+Summary(pl):   Biblioteki Nautilusa
+Group:         X11/Libraries
+
+%description libs
+Nautilus libraries.
+
+%description libs -l pl
+Biblioteki Nautilusa.
+
 %package devel
 Summary:       Libraries and include files for developing Nautilus components
 Summary(pl):   Pliki nag³ówkowe do tworzenia komponentów dla Nautilusa
 Summary(pt_BR):        Bibliotecas e arquivos para desenvolvimento com o nautilus
-Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Group:         X11/Development/Libraries
+Requires:      %{name}-libs = %{version}
 Requires:      eel-devel
 Requires:      librsvg-devel
 
@@ -97,7 +94,7 @@ utilizando componentes do nautilus.
 %package static
 Summary:       Static Nautilus libraries
 Summary(pl):   Biblioteki statyczne Nautilusa
-Group:         Development/Libraries
+Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}
 
 %description static
@@ -106,61 +103,21 @@ Static Nautilus libraries.
 %description static -l pl
 Biblioteki statyczne Nautilusa.
 
-%package mozilla
-Summary:       Nautilus component for use with Mozilla
-Summary(pl):   Czê¶æ Nautilisa do u¿ywania z Mozill±
-Group:         X11/Window Managers
-Requires:      %{name} = %{version}
-Requires:      mozilla >= 0.8
-Conflicts:     mozilla = M18
-Conflicts:     mozilla = M17
-
-%description mozilla
-This enables the use of embedded Mozilla as a Nautilus component.
-
-%description mozilla -l pl
-Ten pakiet pozwala na u¿ywanie wbudowanej Mozilli jako sk³adnika
-Nautilusa.
-
-%description mozilla -l pt_BR
-Espe pacote permite a utilização do Mozilla como um componente
-Nautilus.
-
-%prep -q
+%prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9
-%patch10
-%patch11 -p1
-%patch12 -p1
 
 %build
-rm -f missing
-sed -e s/AM_GNOME_GETTEXT/AM_GNU_GETTEXT/ configure.in > configure.in.tmp
-mv -f configure.in.tmp configure.in
-%{__gettextize}
-xml-i18n-toolize --force --copy --automake
-%{__libtoolize}
-%{__aclocal}
+intltoolize --copy --force
+glib-gettextize --copy --force
+libtoolize --copy --force
+aclocal
 %{__autoconf}
 %{__automake}
-CFLAGS="%{rpmcflags} -DENABLE_SCROLLKEEPER_SUPPORT"
-CPPFLAGS="`/usr/bin/nspr-config --cflags`"; export CPPFLAGS
-LDFLAGS="%{rpmldflags} `/usr/bin/nspr-config --libs`"
+
 %configure \
-       %{?debug:--enable-more-warnings} \
-       %{!?debug:--disable-more-warnings} \
-       --with-mozilla-lib-place=%{_libdir} \
-       --with-mozilla-include-place=%{_includedir}/mozilla \
-       --enable-static
+       --enable-static \
+       --enable-hardware
 
 %{__make}
 
@@ -169,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       omf_dest_dir=%{_omf_dest_dir}/%{name}
+       pkgconfigdir=%{_pkgconfigdir}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -178,86 +135,42 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-scrollkeeper-update
+GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" /usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
 
-%postun
-/sbin/ldconfig
-scrollkeeper-update
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/gnome-db2html2
-%attr(755,root,root) %{_bindir}/gnome-db2html3
-%attr(755,root,root) %{_bindir}/gnome-info2html2
-%attr(755,root,root) %{_bindir}/gnome-man2html2
-%attr(755,root,root) %{_bindir}/hyperbola
-%attr(755,root,root) %{_bindir}/nautilus
-%attr(755,root,root) %{_bindir}/nautilus-adapter
-%attr(755,root,root) %{_bindir}/nautilus-clean.sh
-%attr(755,root,root) %{_bindir}/nautilus-content-loser
-%attr(755,root,root) %{_bindir}/nautilus-error-dialog
-%attr(755,root,root) %{_bindir}/nautilus-hardware-view
-%attr(755,root,root) %{_bindir}/nautilus-history-view
-%attr(755,root,root) %{_bindir}/nautilus-image-view
-%attr(755,root,root) %{_bindir}/nautilus-launcher-applet
-%attr(755,root,root) %{_bindir}/nautilus-music-view
-%attr(755,root,root) %{_bindir}/nautilus-news
-%attr(755,root,root) %{_bindir}/nautilus-notes
-%attr(755,root,root) %{_bindir}/nautilus-preferences-applet
-%attr(755,root,root) %{_bindir}/nautilus-restore-settings-to-default.sh
-%attr(755,root,root) %{_bindir}/nautilus-sample-content-view
-%attr(755,root,root) %{_bindir}/nautilus-sidebar-loser
-%attr(755,root,root) %{_bindir}/nautilus-text-view
-%attr(755,root,root) %{_bindir}/nautilus-throbber
-%attr(755,root,root) %{_bindir}/nautilus-verify-rpm.sh
-%attr(755,root,root) %{_bindir}/nautilus-xml-migrate
-%attr(755,root,root) %{_bindir}/run-nautilus
-%attr(755,root,root) %{_libdir}/libnautilus.so.*.*
-%attr(755,root,root) %{_libdir}/libnautilus-*.so.*.*
-%attr(755,root,root) %{_libdir}/libnautilus-*.so
-%attr(755,root,root) %{_libdir}/vfs/modules/*.so
-%attr(755,root,root) %{_libdir}/vfs/modules/*.la
-%{_mandir}/man1/*
-%{_sysconfdir}/vfs/modules/*.conf
-%{_sysconfdir}/CORBA/servers/*
-%{_applnkdir}/Utilities/*.desktop
-%{_applnkdir}/Help/*.desktop
-%{_datadir}/gnome/ui/*.xml
-%{_datadir}/nautilus
-%{_pixmapsdir}/*
-%{_datadir}/oaf/Nautilus_ComponentAdapterFactory_std.oaf
-%{_datadir}/oaf/Nautilus_Control_throbber.oaf
-%{_datadir}/oaf/Nautilus_shell.oaf
-%{_datadir}/oaf/Nautilus_View_content-loser.oaf
-%{_datadir}/oaf/Nautilus_View_hardware.oaf
-%{_datadir}/oaf/Nautilus_View_help.oaf
-%{_datadir}/oaf/Nautilus_View_history.oaf
-%{_datadir}/oaf/Nautilus_View_image.oaf
-%{_datadir}/oaf/Nautilus_View_music.oaf
-%{_datadir}/oaf/Nautilus_View_news.oaf
-%{_datadir}/oaf/Nautilus_View_notes.oaf
-%{_datadir}/oaf/Nautilus_View_sample.oaf
-%{_datadir}/oaf/Nautilus_View_sidebar-loser.oaf
-%{_datadir}/oaf/Nautilus_View_text.oaf
-%{_datadir}/oaf/Nautilus_View_tree.oaf
-%{_omf_dest_dir}/%{name}
+%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/X11
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/nautilus-*
+%attr(755,root,root) %{_libdir}/bonobo/lib*.??
+%{_libdir}/bonobo/servers/*
+%{_datadir}/applications/*
+%{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/idl/*
+%{_datadir}/nautilus
+%{_pixmapsdir}/*.png
+%{_pixmapsdir}/nautilus
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnautilus.la
 %attr(755,root,root) %{_libdir}/libnautilus.so
-%attr(755,root,root) %{_libdir}/*.sh
-%attr(755,root,root) %{_bindir}/nautilus-config
+%attr(755,root,root) %{_libdir}/libnautilus.la
+%attr(755,root,root) %{_libdir}/libnautilus-adapter.so
+%attr(755,root,root) %{_libdir}/libnautilus-adapter.la
+%attr(755,root,root) %{_libdir}/libnautilus-private.so
+%attr(755,root,root) %{_libdir}/libnautilus-private.la
 %{_includedir}/libnautilus
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%{_libdir}/vfs/modules/*.a
-
-%files mozilla
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/nautilus-mozilla-content-view
-%{_datadir}/oaf/Nautilus_View_mozilla.oaf
+%{_libdir}/bonobo/lib*.a