- many fixes, simplifications and cleanups,

- added static subpackage.

Changed files:
    nautilus.spec -> 1.21

diff --git a/nautilus.spec b/nautilus.spec
index e7366490e9c99e4ff5ed047cefd03764d0af7db5..1e270e27d9f221ff8ee3025d88c7401d1d0cb6cd 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,13 +1,11 @@
-
-Summary:       Nautilus is a file manager for the GNOME desktop environment.
+Summary:       Nautilus is a file manager for the GNOME desktop environment
+Summary(es):   Nautilus is a file manager for the GNOME desktop environment
 Summary(pl):   nautilus - pow³oka GNOME i menad¿er plików
-Summary(pt_BR):        Nautilus é um gerenciador de arquivos para o GNOME
-Summary(es):   Nautilus is a file manager for the GNOME desktop environment.
+Summary(pt_BR): Nautilus é um gerenciador de arquivos para o GNOME
 Name:          nautilus
 Version:       1.0.4
 Release:       1
 License:       GPL
-Vendor:                GNOME
 Group:         X11/Window Managers
 Group(de):     X11/Fenstermanager
 Group(pl):     X11/Zarz±dcy Okien
@@ -16,36 +14,38 @@ Patch0:             %{name}-DESTDIR.patch
 Patch1:                %{name}-applnk.patch
 Patch2:                %{name}-use_AM_GNU_GETTEXT.patch
 URL:           http://nautilus.eazel.com/
-BuildRequires: glib-devel >= 1.2.9
+BuildRequires: GConf-devel >= 0.12
+BuildRequires: ORBit-devel >= 0.5.7
+BuildRequires: bonobo-devel >= 0.37
+BuildRequires: control-center-devel >= 1.3
+BuildRequires: esound-devel >= 0.2.22
+BuildRequires: gdk-pixbuf-devel >= 0.10.0
+BuildRequires: eel-devel >= 1.0
+BuildRequires: freetype-devel >= 2.0.1
 BuildRequires: gtk+-devel >= 1.2.9
 BuildRequires: imlib-devel >= 1.9.8
 BuildRequires: libxml-devel >= 1.8.10
-BuildRequires: gdk-pixbuf-devel >= 0.10.0
+BuildRequires: gettext-devel
 BuildRequires: gnome-libs-devel >= 1.2.11
 BuildRequires: gnome-vfs-devel >= 1.0
 BuildRequires: gnome-http-devel
 BuildRequires: gnome-core-devel >= 1.4.0.4
 BuildRequires: gnome-applets
-BuildRequires: GConf-devel >= 0.12
-BuildRequires: ORBit-devel >= 0.5.7
-BuildRequires: oaf-devel >= 0.6.5
-BuildRequires: bonobo-devel >= 0.37
-BuildRequires: popt-devel >= 1.5
-BuildRequires: freetype-devel >= 2.0.1
-BuildRequires: medusa-devel >= 0.5.1
-BuildRequires: esound-devel >= 0.2.22
-BuildRequires: scrollkeeper >= 0.1.4
 BuildRequires: libpng-devel
-BuildRequires: control-center-devel >= 1.3
 BuildRequires: librsvg-devel >= 1.0.0
-BuildRequires: eel-devel >= 1.0
+BuildRequires: medusa-devel >= 0.5.1
 BuildRequires: mozilla-devel >= 0.8
+BuildRequires: oaf-devel >= 0.6.5
+BuildRequires: scrollkeeper >= 0.1.4
 BuildRequires: xpdf >= 0.90
-BuildRequires:  gettext-devel
 Requires:      GConf >= 1.0.2
+Prereq:                /sbin/ldconfig
+Prereq:                scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
+%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -54,19 +54,20 @@ rich user experience. Nautilus is an free software project developed
 under the GNU General Public License and is a core component of the
 GNOME desktop project.
 
+%description -l es
+nautilus is an excellent file manager for the GNOME desktop
+environment
+
 %description -l pl
 GNU Nautilus jest mened¿erem plików i graficzn± pow³ok± dla GNOME.
 
 %description -l pt_BR
 O nautilus é um excelente gerenciador de arquivos para o GNOME.
 
-%description -l es
-nautilus is an excellent file manager for the GNOME desktop environment
-
 %package devel
 Summary:       Libraries and include files for developing Nautilus components
-Summary(pt_BR):        Bibliotecas e arquivos para desenvolvimento com o nautilus
 Summary(es):   Libraries and include files for developing nautilus components
+Summary(pt_BR):        Bibliotecas e arquivos para desenvolvimento com o nautilus
 Group:         Development/Libraries
 Group(de):     Entwicklung/Libraries
 Group(fr):     Development/Librairies
@@ -77,16 +78,31 @@ Requires:   %name = %{version}
 This package provides the necessary development libraries and include
 files to allow you to develop Nautilus components.
 
+%description -l es devel
+This package provides the necessary development libraries and include
+files to allow you to develop nautilus components.
+
 %description devel -l pl
 Biblioteki i pliki nag³ówkowe potrzebne do programowania.
 
 %description -l pt_BR devel
-Este pacote fornece os arquivos necessários para desenvolvimento utilizando
-componentes do nautilus.
+Este pacote fornece os arquivos necessários para desenvolvimento
+utilizando componentes do nautilus.
 
-%description -l es devel
-This package provides the necessary development libraries and include files to
-allow you to develop nautilus components.
+%package static
+Summary:       Static Nautilus libraries
+Summary(pl):   Biblioteki staticzne Nautilusa
+Group:         Development/Libraries
+Group(de):     Entwicklung/Libraries
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Requires:      %name-devel = %{version}
+
+%description static
+Static Nautilus libraries.
+
+%description -l pl static
+Biblioteki staticzne Nautilusa.
 
 %package mozilla
 Summary:       Nautilus component for use with Mozilla
@@ -102,7 +118,8 @@ Conflicts:  mozilla = M17
 This enables the use of embedded Mozilla as a Nautilus component.
 
 %description mozilla -l pt_BR
-Espe pacote permite a utilização do Mozilla como um componente Nautilus.
+Espe pacote permite a utilização do Mozilla como um componente
+Nautilus.
 
 %prep -q
 %setup -q
@@ -110,36 +127,30 @@ Espe pacote permite a utiliza
 %patch1 -p1
 %patch2 -p0
 
-
 %build
 rm missing
 CFLAGS="%{rpmcflags} -DENABLE_SCROLLKEEPER_SUPPORT"
 
 automake -a -c
 %configure2_13 \
-       --enable-more-warnings \
-       --prefix=%{_prefix} \
-       --datadir=%{_datadir} \
-       --sysconfdir=%{_sysconfdir} \
-       --includedir=%{_includedir} \
-       --libdir=%{_libdir} \
-       --bindir=%{_bindir} \
+       %{?debug:--enable-more-warnings} \
+       %{!?debug:--disable-more-warnings} \
        --with-mozilla-lib-place=%{_libdir} \
-       --with-mozilla-include-place=%{_includedir}/mozilla \
-%ifarch alpha
-       --host=alpha-redhat-linux
-%endif
+       --with-mozilla-include-place=%{_includedir}/mozilla
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       omf_dest_dir=%{_omf_dest_dir}/omf/%{name}
 
-%find_lang %{name} --with-gnome --all-name
 gzip -9nf ChangeLog NEWS README
 
+%find_lang %{name} --with-gnome --all-name
+
 %post
 /sbin/ldconfig
 scrollkeeper-update
@@ -178,60 +189,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/run-nautilus
 %attr(755,root,root) %{_bindir}/nautilus-launcher-applet
 %attr(755,root,root) %{_bindir}/nautilus-xml-migrate
-%{_libdir}/libnautilus-adapter.so.0
-%attr(755,root,root) %{_libdir}/libnautilus-adapter.so.0.0.0
-%{_libdir}/libnautilus-private.so.0
-%attr(755,root,root) %{_libdir}/libnautilus-private.so.0.0.0
-%{_libdir}/libnautilus-tree-view.so.0
-%attr(755,root,root) %{_libdir}/libnautilus-tree-view.so.0.0.0
-%{_libdir}/libnautilus.so.0
-%attr(755,root,root) %{_libdir}/libnautilus.so.0.0.0
-%attr(755,root,root) %{_libdir}/libnautilus-adapter.so
-%attr(755,root,root) %{_libdir}/libnautilus-private.so
-%attr(755,root,root) %{_libdir}/libnautilus-tree-view.so
-%attr(755,root,root) %{_libdir}/libnautilus.so
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %attr(755,root,root) %{_libdir}/vfs/modules/*.so
-%config %{_sysconfdir}/vfs/modules/*.conf
-%config %{_sysconfdir}/CORBA/servers/nautilus-launcher-applet.gnorba
+%{_mandir}/man1/*
+%{_sysconfdir}/vfs/modules/*.conf
+%{_sysconfdir}/CORBA/servers/*
 %{_applnkdir}/Utilities/*.desktop
 %{_datadir}/gnome/ui/*.xml
-%{_datadir}/nautilus/components/hyperbola/maps/*.map
-%{_datadir}/nautilus/components/hyperbola/*.xml
-%{_datadir}/nautilus/*.xml
-%{_datadir}/nautilus/emblems/*.png
-%{_datadir}/nautilus/linksets/*.xml
-%{_datadir}/nautilus/patterns/*.jpg
-%{_datadir}/nautilus/patterns/*.png
-%{_datadir}/nautilus/patterns/.*.png
-%{_datadir}/nautilus/services/text/*.xml
-%{_datadir}/pixmaps/*.png
-%{_datadir}/pixmaps/nautilus/*.gif
-%{_datadir}/pixmaps/nautilus/*.png
-%{_datadir}/pixmaps/nautilus/*.svg
-%{_datadir}/pixmaps/nautilus/*.xml
-%{_datadir}/pixmaps/nautilus/tahoe/*.png
-%{_datadir}/pixmaps/nautilus/tahoe/*.xml
-%{_datadir}/pixmaps/nautilus/crux_teal/*.png
-%{_datadir}/pixmaps/nautilus/crux_teal/*.xml
-%{_datadir}/pixmaps/nautilus/crux_teal/throbber/*.png
-%{_datadir}/pixmaps/nautilus/crux_teal/backgrounds/*.png
-%{_datadir}/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/*.png
-%{_datadir}/pixmaps/nautilus/crux_eggplant/*.png
-%{_datadir}/pixmaps/nautilus/crux_eggplant/*.xml
-%{_datadir}/pixmaps/nautilus/crux_eggplant/throbber/*.png
-%{_datadir}/pixmaps/nautilus/crux_eggplant/backgrounds/*.png
-%{_datadir}/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/*.png
-%{_datadir}/pixmaps/nautilus/eazel-logos/*.png
-%{_datadir}/pixmaps/nautilus/eazel-logos/*.xml
-%{_datadir}/pixmaps/nautilus/eazel-logos/throbber/*.png
-%{_datadir}/pixmaps/nautilus/eazel-logos/LICENSE
-%{_datadir}/pixmaps/nautilus/gnome/*.png
-%{_datadir}/pixmaps/nautilus/gnome/*.xml
-%{_datadir}/pixmaps/nautilus/gnome/throbber/*.png
-%{_datadir}/pixmaps/nautilus/sidebar_tab_pieces/*.png
-%{_datadir}/pixmaps/nautilus/throbber/*.png
-%{_datadir}/pixmaps/nautilus/sierra/*.xml
-%{_datadir}/pixmaps/nautilus/sierra/*.png
+%{_datadir}/nautilus
+%{_pixmapsdir}/*
 %{_datadir}/oaf/Nautilus_View_help.oaf
 %{_datadir}/oaf/Nautilus_ComponentAdapterFactory_std.oaf
 %{_datadir}/oaf/Nautilus_View_content-loser.oaf
@@ -247,17 +213,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/oaf/Nautilus_View_tree.oaf
 %{_datadir}/oaf/Nautilus_shell.oaf
 %{_datadir}/oaf/Nautilus_Control_throbber.oaf
-%{_datadir}/idl/nautilus-view-component.idl
-%{_datadir}/idl/nautilus-distributed-undo.idl
-%{_datadir}/omf/nautilus
+%{_omf_dest_dir}/omf/%{name}
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/*.la
-%{_libdir}/vfs/modules/*.la
-%{_libdir}/*.sh
+%attr(755,root,root) %{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/vfs/modules/*.la
+%attr(755,root,root) %{_libdir}/*.sh
 %attr(755,root,root) %{_bindir}/nautilus-config
-%{_includedir}/libnautilus/*.h
+%{_includedir}/libnautilus
+%{_datadir}/idl/*
+
+%files static
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.a
 
 %files mozilla
 %defattr(644,root,root,755)