--- a/gnome-vfs.spec Thu Aug 11 18:30:17 2005 +0000
+++ b/gnome-vfs.spec Thu Aug 11 18:34:53 2005 +0000
@@ -1,79 +1,48 @@
+#
+# spec file for package gnome-vfs
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
Name: gnome-vfs
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.6.0
-Release: 80
-Distribution: Java Desktop System, Release 3
+Version: 2.10.1
+Release: 3
+Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Virtual File System Library for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-%{version}.tar.bz2
-Source1: gnome-vfs-l10n-po-1.14.tar.bz2
-Source2: libgnomevfs-2.3.gz
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
+Source1: libgnomevfs-2.3.gz
+Source2: gnomevfs-mkdir.1.gz
Source3: gnomevfs-cat.1.gz
Source4: gnomevfs-copy.1.gz
Source5: gnomevfs-info.1.gz
Source6: gnomevfs-ls.1.gz
-Source7: gnomevfs-mkdir.1.gz
-Source8: l10n-configure.sh
-Patch1: gnome-vfs-01-menu-setup.diff
-Patch2: gnome-vfs-02-ftp-authn-keyring.diff
-Patch3: gnome-vfs-03-uri-canonizing.diff
-Patch4: gnome-vfs-04-network-all-users.diff
-Patch5: gnome-vfs-05-vfolder-file-monitor.diff
-Patch6: gnome-vfs-06-preference-menu-reorder.diff
-Patch7: gnome-vfs-07-quick-start-uri.diff
-Patch8: gnome-vfs-08-vfolder-permissions.diff
-Patch9: gnome-vfs-09-system-settings-uri.diff
-Patch10: gnome-vfs-10-this-comp-and-hotplug-names.diff
-Patch11: gnome-vfs-11-uninstalled_pc.diff
-Patch12: gnome-vfs-12-nfs-drag-crash.diff
-Patch13: gnome-vfs-13-gopher-proxy-schema.diff
-Patch14: gnome-vfs-14-g11n-potfiles.diff
-Patch15: gnome-vfs-15-nautilus-crash-136748-from-head.diff
-Patch16: gnome-vfs-16-jdshelp-schema.diff
-Patch17: gnome-vfs-17-default-url-handler.diff
-Patch18: gnome-vfs-18-mime-info-file-path.diff
-Patch19: gnome-vfs-19-ftp-data-loss.diff
-Patch20: gnome-vfs-20-unix-device-type.diff
-Patch21: gnome-vfs-21-ftp-upload-crash.diff
-Patch22: gnome-vfs-22-eject-solaris-rmm.diff
-Patch23: gnome-vfs-23-ftp-crash.diff
-Patch24: gnome-vfs-24-g11n-i18n-ui.diff
-Patch25: gnome-vfs-25-ftp-hostname-crash.diff
-Patch26: gnome-vfs-26-sftp-exit-fix.diff
-Patch27: gnome-vfs-27-mime-non_utf_8-filename.diff
-Patch28: gnome-vfs-28-network-places.diff
-Patch29: gnome-vfs-29-gnome-printinfo.diff
-Patch30: gnome-vfs-30-https-handler.diff
-Patch31: gnome-vfs-31-last_mtime.diff
-Patch32: gnome-vfs-32-no-xml-sniff.diff
-Patch33: gnome-vfs-33-volume-free-space-fix.diff
-Patch34: gnome-vfs-34-panel-polling.diff
-Patch35: gnome-vfs-35-trash-only-home.diff
-Patch36: gnome-vfs-36-g11n-potfiles.diff
-Patch37: gnome-vfs-37-sftp.diff
-Patch38: gnome-vfs-38-mount-points-fix.diff
-Patch39: gnome-vfs-39-correct-screen-for-folder.diff
-Patch40: gnome-vfs-40-fork-off.diff
-Patch41: gnome-vfs-41-g11n-potfiles.diff
-Patch42: gnome-vfs-42-subfs.diff
-Patch43: gnome-vfs-43-ignore-rootfs.diff
-Patch44: gnome-vfs-44-.Z-association.diff
-Patch45: gnome-vfs-45-smb-browse-fixes.diff
-Patch46: gnome-vfs-46-write-new-style-mime-types-for-user-dir.diff
-Patch47: gnome-vfs-47-mime-type-case-insensitive.diff
-Patch48: gnome-vfs-48-trash-files-from-different-filesystem.diff
-Patch49: gnome-vfs-49-socks-version.diff
-Patch50: gnome-vfs-50-audio-cd-show-icon.diff
-Patch51: gnome-vfs-51-ftp-show-permissions.diff
-Patch52: gnome-vfs-52-ftp-auth.diff
-Patch53: gnome-vfs-53-trash-skip-copy.diff
+Patch1: gnome-vfs-01-uri-canonizing.diff
+Patch2: gnome-vfs-02-uninstalled-pc.diff
+Patch3: gnome-vfs-03-gopher-proxy-schema.diff
+Patch4: gnome-vfs-04-jdshelp-schema.diff
+Patch5: gnome-vfs-05-default-url-handler.diff
+Patch6: gnome-vfs-06-mime-info-file-path.diff
+Patch7: gnome-vfs-07-g11n-i18n-ui.diff
+Patch8: gnome-vfs-08-trash-only-home.diff
+Patch9: gnome-vfs-09-mount-points-fix.diff
+Patch10: gnome-vfs-10-trash-files-from-different-filesystem.diff
+Patch11: gnome-vfs-11-socks-version.diff
+Patch12: gnome-vfs-12-audio-cd-show-icon.diff
+Patch13: gnome-vfs-13-ftp-show-permissions.diff
+Patch14: gnome-vfs-14-trash-skip-copy.diff
+Patch15: gnome-vfs-15-forte-build-fix.diff
+Patch16: gnome-vfs-16-nocopy.diff
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
Autoreqprov: on
Prereq: /sbin/ldconfig
+Prereq: GConf
%define libbonobo_version 2.6.0
%define GConf_version 2.6.1
@@ -138,51 +107,7 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%ifos solaris
-%patch29 -p1
-%endif
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-#%patch41 -p1
-%ifos linux
-%patch42 -p1
-%endif
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-bzcat %SOURCE1 | tar xvf -
-
-bash -x %SOURCE8
%build
%ifos linux
@@ -196,7 +121,7 @@
CPUS=1
fi
libtoolize --force
-aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I .
+aclocal $ACLOCAL_FLAGS -I .
gtkdocize
autoheader
automake -a -c -f
@@ -214,12 +139,12 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
rm $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.a
rm $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
rm $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.a
@@ -256,7 +181,6 @@
%{_sysconfdir}/gconf/schemas/*.schemas
%config %{_sysconfdir}/gnome-vfs-2.0
%{_libdir}/gnome-vfs-2.0/modules/*.so
-%{_libdir}/vfs
%{_libexecdir}/*
%{_libdir}/libgnomevfs-2.so.*
@@ -273,6 +197,39 @@
%{_mandir}/man3/*
%changelog
+* Sun Aug 07 2005 - [email protected]
+- Remove Computer and subfs patches to align better with community code.
+ Narayana did the work to decide which bits we need to remove.
+
+* Thu Aug 04 2005 - [email protected]
+- add patch18 (nocopy.diff) for bugzilla bug 311591,
+ fix by <[email protected]>
+
+* Wed Jul 27 2005 - [email protected]
+- Removed patches gnome-vfs-04-nfs-drag-crash.diff (not required as nfs://
+ method is removed) and gnome-vfs-12-correct-screen-for-folder.diff
+ (upstream, fix present in 2.10). Renamed the other patches accordingly.
+
+* Fri Jun 24 2005 - [email protected]
+- Added patch gnome-vfs-19-subfs.diff
+- Removed patch gnome-vfs-X-subfs.diff
+
+* Fri May 13 2005 - [email protected]
+- Updated the patch gnome-vfs-42-subfs.diff with fix for bug #6257289,
+ crashing of nautilus when doing eject from context menu of CD icon.
+
+* Wed May 11 2005 - [email protected]
+- Add patch 18 to remove usage of gcc-extension that is not available
+ in Forte.
+
+* Fri May 06 2005 - [email protected]
+- Updated the patch gnome-vfs-45-smb-browse-fixes.diff with fixes for
+ bug #6259956, permissions not followed in smb:///. The changes were
+ backported from community CVS HEAD.
+
+* Fri May 06 2005 - [email protected]
+- Bump to 2.10.1
+
* Fri Apr 22 2005 - [email protected]
- Added patch gnome-vfs-53-trash-skip-copy.diff to fix a trash issue.
Fixes bug #6243507