rpms/nautilus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import nautilus-1.0.6-3 from nautilus-1.0.6-3.src.rpm

Browse Source
This commit is contained in:
cvsdist 2004-09-09 09:02:07 +00:00
parent 927044e982
commit a71ace013e
3 changed files with 42 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,3 +1 @@
desktop-folders.tar.gz nautilus-1.0.6.tar.gz
nautilus-1.0.4-snapshot.tar.gz
nautilus-pofiles.tar.gz

129
nautilus.spec
View File

@ -1,14 +1,11 @@
Name: nautilus Name: nautilus
Summary: Nautilus is a network user environment Summary: Nautilus is a network user environment
Version: 1.0.4 Version: 1.0.6
Release: 48 Release: 3
Copyright: GPL Copyright: GPL
Group: User Interface/Desktops Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/%{name}-%{version}-snapshot.tar.gz Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/%{name}-%{version}.tar.gz
Source2: nautilus-redhat-theme.xml Source2: nautilus-redhat-theme.xml
Source3: desktop-folders.tar.gz
Source4: reset.png
Source5: nautilus-pofiles.tar.gz
URL: http://nautilus.eazel.com/ URL: http://nautilus.eazel.com/
BuildRoot: /var/tmp/%{name}-%{version}-root BuildRoot: /var/tmp/%{name}-%{version}-root
Requires: glib >= 1.2.9 Requires: glib >= 1.2.9
@ -19,16 +16,16 @@ Requires: gnome-libs >= 1.2.11
Requires: GConf >= 0.12 Requires: GConf >= 0.12
Requires: ORBit >= 0.5.7 Requires: ORBit >= 0.5.7
Requires: oaf >= 0.6.5 Requires: oaf >= 0.6.5
Requires: gnome-vfs >= 1.0.1-13 Requires: gnome-vfs >= 1.0.3
Requires: gdk-pixbuf >= 0.14.0 Requires: gdk-pixbuf >= 0.10.0
Requires: bonobo >= 0.37 Requires: bonobo >= 1.0.9
Requires: popt >= 1.5 Requires: popt >= 1.5
Requires: freetype >= 2.0.1 Requires: freetype >= 2.0.1
Requires: esound >= 0.2.22 Requires: esound >= 0.2.22
Requires: libpng Requires: libpng
Requires: control-center >= 1.3 Requires: control-center >= 1.3
Requires: librsvg >= 1.0.0 Requires: librsvg >= 1.0.1
Requires: eel >= 1.0.1-10 Requires: eel >= 1.0.2
Requires: indexhtml Requires: indexhtml
Requires: fam Requires: fam
Requires: filesystem >= 2.1.1-1 Requires: filesystem >= 2.1.1-1
@ -51,19 +48,18 @@ BuildRequires: GConf-devel >= 0.12
BuildRequires: ORBit-devel >= 0.5.7 BuildRequires: ORBit-devel >= 0.5.7
BuildRequires: oaf-devel >= 0.6.5 BuildRequires: oaf-devel >= 0.6.5
BuildRequires: gnome-core-devel BuildRequires: gnome-core-devel
BuildRequires: gnome-vfs-devel >= 1.0.1-4 BuildRequires: gnome-vfs-devel >= 1.0.3
BuildRequires: gdk-pixbuf-devel >= 0.14.0 BuildRequires: gdk-pixbuf-devel >= 0.10.0
BuildRequires: bonobo-devel >= 0.37 BuildRequires: bonobo-devel >= 1.0.9
BuildRequires: popt >= 1.5 BuildRequires: popt >= 1.5
BuildRequires: freetype-devel >= 2.0.1 BuildRequires: freetype-devel >= 2.0.1
BuildRequires: esound-devel >= 0.2.22 BuildRequires: esound-devel >= 0.2.22
BuildRequires: scrollkeeper >= 0.1.4 BuildRequires: scrollkeeper >= 0.1.4
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: control-center-devel >= 1.3 BuildRequires: control-center-devel >= 1.3
BuildRequires: librsvg-devel >= 1.0.0 BuildRequires: librsvg-devel >= 1.0.1
BuildRequires: eel-devel >= 1.0.1-8 BuildRequires: eel-devel >= 1.0.2
#This is commented out becaus RPM doesn't support ifarch BuildRequires BuildRequires: mozilla-devel >= 0.9.6
#BuildRequires: mozilla-devel >= 0.9.2-10
BuildRequires: xpdf >= 0.90 BuildRequires: xpdf >= 0.90
BuildRequires: fam-devel BuildRequires: fam-devel
BuildRequires: automake BuildRequires: automake
@ -73,23 +69,18 @@ BuildRequires: librsvg
Obsoletes: nautilus-extras Obsoletes: nautilus-extras
Obsoletes: nautilus-suggested Obsoletes: nautilus-suggested
Patch1: nautilus-1.0.3-bookmarks.patch Patch1: nautilus-1.0.5-bookmarks.patch
Patch2: nautilus-1.0.3-new_theme.patch Patch2: nautilus-1.0.5-new_theme.patch
Patch3: nautilus-1.0.3-no-dialog.patch Patch3: nautilus-1.0.3-no-dialog.patch
Patch4: nautilus-1.0.3.2-useredhattheme.patch Patch4: nautilus-1.0.3.2-useredhattheme.patch
Patch8: nautilus-1.0.4-noflash.patch Patch8: nautilus-1.0.4-noflash.patch
# Fixes and hacks for more efficient desktop backgrounds # Fixes and hacks for more efficient desktop backgrounds
Patch13: nautilus-1.0.4-bghack.patch Patch13: nautilus-1.0.5-bghack.patch
Patch16: nautilus-1.0.4-norootwarning.patch Patch16: nautilus-1.0.4-norootwarning.patch
Patch17: nautilus-snap-directory.patch Patch19: nautilus-1.0.5-monitorfavorites.patch
Patch18: nautilus-1.0.4-removeicons.patch Patch20: nautilus-1.0.5-showonlydirectories.patch
Patch19: nautilus-1.0.4-newmozilla.patch Patch21: nautilus-1.0.5-unwritable.patch
Patch20: nautilus-1.0.4-1.0.6-mozilla.patch Patch22: nautilus-1.0.6-mozilla-profile-startup.patch
Patch21: nautilus-1.0.6-metafilerace.patch
Patch22: nautilus-1.0.4-noglobalmetadata.patch
Patch23: nautilus-1.0.6-fixperms.patch
Patch24: nautilus-1.0.4-moz-1.0.1.patch
Patch25: nautilus-1.0.4-pixbuf-0.14.0.patch
%description %description
Nautilus integrates access to files, applications, media, Nautilus integrates access to files, applications, media,
@ -111,64 +102,38 @@ files to allow you to develop Nautilus components.
Summary: Nautilus component for use with Mozilla Summary: Nautilus component for use with Mozilla
Group: User Interface/Desktops Group: User Interface/Desktops
Requires: %name = %{version} Requires: %name = %{version}
Requires: mozilla >= 1.0.1 Requires: mozilla >= 0.9.7
Conflicts: mozilla = M18 Conflicts: mozilla = M18
Conflicts: mozilla = M17 Conflicts: mozilla = M17
Conflicts: mozilla <= 0.9.6
%description mozilla %description mozilla
This enables the use of embedded Mozilla as a Nautilus component. This enables the use of embedded Mozilla as a Nautilus component.
%prep %prep
%setup -q -n %{name}-%{version}-snapshot %setup -q -n %{name}-%{version}
## give us something to patch %patch1 -p0 -b .bookmarks
touch libnautilus-private/nautilus-desktop-file.h
touch libnautilus-private/nautilus-desktop-file.c
cp %{SOURCE4} data/patterns
## unpack pofiles
tar zxf %{SOURCE5}
%patch1 -p1 -b .bookmarks
%patch2 -p1 -b .new_theme %patch2 -p1 -b .new_theme
%patch3 -p1 -b .no-dialog %patch3 -p1 -b .no-dialog
%patch4 -p1 -b .useredhattheme %patch4 -p1 -b .useredhattheme
%patch8 -p1 -b .noflash %patch8 -p1 -b .noflash
%patch13 -p1 -b .bghack %patch13 -p1 -b .bghack
%patch16 -p0 -b .norootwarning %patch16 -p0 -b .norootwarning
%patch17 -p1 -b .directory %patch19 -p0 -b .monitorfavorites
%patch18 -p1 -b .removeicons %patch20 -p0 -b .showonlydirectories
%patch19 -p1 -b .sopwith %patch21 -p0 -b .unwritable
%patch20 -p1 -b .1.0.6-mozilla %patch22 -p1 -b .profile
%patch21 -p1 -b .metafilerace
%patch22 -p1 -b .noglobalmetadata
%patch23 -p1 -b .fixperms
%patch24 -p1 -b .moz-1.0.1
%patch25 -p1 -b .pixbuf-0.14.0
## desktop-folders
tar zxf %{SOURCE3}
%build %build
autoheader autoheader
automake automake
autoconf autoconf
%ifarch ia64
CFLAGS="$RPM_OPT_FLAGS -g" %configure --disable-more-warnings --disable-mozilla-component
%else
CFLAGS="$RPM_OPT_FLAGS -g" %configure --disable-more-warnings CFLAGS="$RPM_OPT_FLAGS -g" %configure --disable-more-warnings
%endif
# Hack things so that a build with smp_mflags will be more likely to work make
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 %install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@ -185,8 +150,6 @@ cp -af $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/nautilus/sidebar_tab_pieces/* \
rm $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/nautilus/redhat/gnome.xml rm $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/nautilus/redhat/gnome.xml
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/nautilus/redhat/redhat.xml install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/nautilus/redhat/redhat.xml
(cd desktop-folders && DESTDIR=$RPM_BUILD_ROOT ./run-install.sh)
%find_lang %name %find_lang %name
%clean %clean
@ -241,11 +204,8 @@ scrollkeeper-update
%{_libdir}/libnautilus.so.0.0.0 %{_libdir}/libnautilus.so.0.0.0
%{_libdir}/libnautilus-tree-view.so %{_libdir}/libnautilus-tree-view.so
%{_libdir}/vfs/modules/*.so %{_libdir}/vfs/modules/*.so
%config %{_sysconfdir}/vfs/modules/*.conf %config %{_sysconfdir}/vfs/modules/*.conf
%config %{_sysconfdir}/CORBA/servers/nautilus-launcher-applet.gnorba %config %{_sysconfdir}/CORBA/servers/nautilus-launcher-applet.gnorba
%{_datadir}/gnome/apps/Applications/*.desktop %{_datadir}/gnome/apps/Applications/*.desktop
@ -267,33 +227,24 @@ scrollkeeper-update
%{_bindir}/nautilus-config %{_bindir}/nautilus-config
%{_includedir}/libnautilus %{_includedir}/libnautilus
%ifnarch ia64
%files mozilla %files mozilla
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/nautilus-mozilla-content-view %{_bindir}/nautilus-mozilla-content-view
%{_datadir}/oaf/Nautilus_View_mozilla.oaf %{_datadir}/oaf/Nautilus_View_mozilla.oaf
%endif
%changelog %changelog
* Fri Sep 13 2002 Christopher Blizzard <blizzard@redhat.com> * Mon Jan 28 2002 Bill Nottingham <notting@redhat.com>
- Update for mozilla 1.0.1 - enable mozilla support on ia64
* Thu May 9 2002 Christopher Blizzard <blizzard@redhat.com> * Fri Dec 28 2001 Christopher Blizzard <blizzard@redhat.com>
- Rebuild for 7.2 errata. - require Mozilla 0.9.7
- Add patch that puts mozilla profile startup before embedding is initialized
* Mon Apr 29 2002 Havoc Pennington <hp@redhat.com> * Tue Nov 20 2001 Havoc Pennington <hp@redhat.com>
- port patch to use mode 600 even for metadata stored in homedir - 1.0.6, require Mozilla 0.9.6
* Sun Apr 28 2002 Havoc Pennington <hp@redhat.com> * Tue Oct 23 2001 Alex Larsson <alexl@redhat.com>
- port patch to totally disable global metadata - Update to 1.0.5
* 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> * Thu Sep 6 2001 Owen Taylor <otaylor@redhat.com>
- Fix handling of GnomeVFSFileInfo structure (#53315) - Fix handling of GnomeVFSFileInfo structure (#53315)

4
sources
View File

@ -1,3 +1 @@
557c87a7c2780665417909533a241bbf desktop-folders.tar.gz 436283056c100bcbd14098a5342e2868 nautilus-1.0.6.tar.gz
a85c9d387057b06541f05a94686b5ad4 nautilus-1.0.4-snapshot.tar.gz
3ccd6963e38adad38377cbfbdc7b9a63 nautilus-pofiles.tar.gz