From 3a8694379795ec9ce64630daf452e056612c80bc Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 08:59:29 +0000
Subject: auto-import changelog data from nautilus-1.0.4-45.1.src.rpm

Sun Apr 28 2002 Havoc Pennington <hp@redhat.com>
- port patch to totally disable global metadata
Mon Apr 15 2002 Havoc Pennington <hp@redhat.com>
- backport patch for metafile race condition
Wed Mar 27 2002 Elliot Lee <sopwith@redhat.com> 1.0.4-43.1
- Patch19 - build with mozilla 0.9.9
- Patch20 - finish building with mozilla 0.9.9 by patching to the
1.0.6 mozilla component

---

diff --git a/nautilus.spec b/nautilus.spec
index 29d92a2..f249807 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,7 +1,7 @@
 Name:		nautilus
 Summary: Nautilus is a network user environment
 Version: 	1.0.4
-Release: 	43b
+Release: 	45.1
 Copyright: 	GPL
 Group: User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/stable/sources/%{name}-%{version}-snapshot.tar.gz
@@ -32,6 +32,7 @@ Requires:	eel >= 1.0.1-10
 Requires:       indexhtml
 Requires:	fam
 Requires:       filesystem >= 2.1.1-1
+Requires:	hwbrowser
 
 %ifarch i386 alpha
 Requires:	nautilus-mozilla
@@ -82,8 +83,10 @@ Patch13:	nautilus-1.0.4-bghack.patch
 Patch16:        nautilus-1.0.4-norootwarning.patch
 Patch17:        nautilus-snap-directory.patch
 Patch18:        nautilus-1.0.4-removeicons.patch
-# Fix for scrollkeeper segfault on S390
-Patch20:        nautilus-1.0.4-scrollkeeper.patch
+Patch19:	nautilus-1.0.4-newmozilla.patch
+Patch20:	nautilus-1.0.4-1.0.6-mozilla.patch
+Patch21:        nautilus-1.0.6-metafilerace.patch
+Patch22:        nautilus-1.0.4-noglobalmetadata.patch
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -101,6 +104,17 @@ Requires:	%name = %{version}
 This package provides the necessary development libraries and include
 files to allow you to develop Nautilus components.
 
+%package mozilla
+Summary: Nautilus component for use with Mozilla
+Group: User Interface/Desktops
+Requires:       %name = %{version}
+Requires:	mozilla >= 0.9.2-10
+Conflicts:	mozilla = M18
+Conflicts:	mozilla = M17
+
+%description mozilla
+This enables the use of embedded Mozilla as a Nautilus component.
+
 
 %prep
 %setup -q -n %{name}-%{version}-snapshot
@@ -123,7 +137,10 @@ tar zxf %{SOURCE5}
 %patch16 -p0 -b .norootwarning
 %patch17 -p1 -b .directory
 %patch18 -p1 -b .removeicons
-%patch20 -p1 -b .scrollkeeper
+%patch19 -p1 -b .sopwith
+%patch20 -p1 -b .1.0.6-mozilla
+%patch21 -p1 -b .metafilerace
+%patch22 -p1 -b .noglobalmetadata
 
 ## desktop-folders
 tar zxf %{SOURCE3}
@@ -132,13 +149,20 @@ tar zxf %{SOURCE3}
 autoheader
 automake
 autoconf
-%ifarch ia64 s390 s390x
+%ifarch ia64
 CFLAGS="$RPM_OPT_FLAGS -g" %configure --disable-more-warnings --disable-mozilla-component
 %else
 CFLAGS="$RPM_OPT_FLAGS -g" %configure --disable-more-warnings
 %endif
 
-make
+# Hack things so that a build with smp_mflags will be more likely to work
+make -C libnautilus nautilus_view_component_idl_stamp \
+	 nautilus_distributed_undo_idl_stamp
+make -C libnautilus-adapter nautilus_adapter_factory_idl_stamp
+make -C libnautilus-private nautilus_metafile_server_idl_stamp
+make -C src nautilus_shell_interface_idl_stamp
+
+make %{?_smp_mflags}
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -237,7 +261,25 @@ scrollkeeper-update
 %{_bindir}/nautilus-config
 %{_includedir}/libnautilus
 
+%ifnarch ia64
+%files mozilla
+%defattr(-,root,root)
+%{_bindir}/nautilus-mozilla-content-view
+%{_datadir}/oaf/Nautilus_View_mozilla.oaf
+%endif
+
 %changelog
+* Sun Apr 28 2002 Havoc Pennington <hp@redhat.com>
+- port patch to totally disable global metadata
+
+* Mon Apr 15 2002 Havoc Pennington <hp@redhat.com>
+- backport patch for metafile race condition
+
+* Wed Mar 27 2002 Elliot Lee <sopwith@redhat.com> 1.0.4-43.1
+- Patch19 - build with mozilla 0.9.9
+- Patch20 - finish building with mozilla 0.9.9 by patching to the
+  1.0.6 mozilla component
+
 * Thu Sep  6 2001 Owen Taylor <otaylor@redhat.com>
 - Fix handling of GnomeVFSFileInfo structure (#53315)