From da3aab8b21c8c98afd5df6e6a4bb1bbdf4f6ba0d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:43:15 +0000 Subject: [PATCH] auto-import changelog data from gnome-vfs2-2.6.0-8.src.rpm Thu May 13 2004 Elliot Lee 2.6.0-8 - Patch61 (desktop-file-utils-0.6-pleasecreate.patch) to fix #119446 Tue May 04 2004 Dan Williams 2.6.0-7 - Update to desktop-file-utils 0.6 - Implement monitoring to detect addition/deletion of .desktop files - Fix RH #118553, crash when reading symlink that points to nothing in libmenu.so VFS backend Thu Apr 22 2004 Mark McLoughlin - 2.6.0-6 - Fix crash when .desktop files aren't readable (bug #120014) Fri Apr 16 2004 Alexander Larsson 2.6.0-5 - Make mozilla default http handler since epi might not be installed Thu Apr 15 2004 Alexander Larsson 2.6.0-4 - New cvs backport with sftp fix Wed Apr 14 2004 Alexander Larsson 2.6.0-3 - install more schemas in post Wed Apr 14 2004 Alexander Larsson 2.6.0-2 - Add cvs fixes backport Tue Mar 23 2004 Alex Larsson 2.6.0-1 - update to 2.6.0 Thu Mar 18 2004 Warren Togami 2.5.91-3 - #118614 patches 100 and 101 --- .cvsignore | 4 +-- gnome-vfs2.spec | 70 ++++++++++++++++++++++++++++++++++++++++--------- sources | 4 +-- 3 files changed, 61 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5875a5e..fdeaa3d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -desktop-file-utils-0.4.tar.gz -gnome-vfs-2.5.91.tar.bz2 +desktop-file-utils-0.6.tar.gz +gnome-vfs-2.6.0.tar.bz2 diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index b34c4d3..97c6a88 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -6,17 +6,18 @@ %define redhat_menus_version 1.0 %define perl_XML_Parser_version 2.31-16 %define po_package gnome-vfs-2.0 +%define desktop-file-utils_version 0.6 Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 -Version: 2.5.91 -Release: 2 +Version: 2.6.0 +Release: 8 License: LGPL Group: System Environment/Libraries Source: gnome-vfs-%{version}.tar.bz2 Source2: vfolder-desktop-method.c Source3: desktop-method.c -Source4: desktop-file-utils-0.4.tar.gz +Source4: desktop-file-utils-0.6.tar.gz URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -52,15 +53,23 @@ Patch9: gnome-vfs-2.1.6-no-private-methods.patch Patch10: gnome-vfs2-2.5.5-vfolder-hacks.patch +Patch11: gnome-vfs-2.6.0-cvs-backport.patch +Patch12: gnome-vfs-2.6.0-mozilla.patch + + # desktop-file-utils patches -Patch50: desktop-file-utils-0.4-fdo-spec-0.8-fix.patch -Patch51: desktop-file-utils-0.4-initial-section-fix.patch Patch52: desktop-file-utils-0.4-rh-schemes.patch Patch53: desktop-file-utils-0.4-hide-empty-submenus.patch Patch54: desktop-file-utils-0.4-menu-only-show-in.patch Patch55: desktop-file-utils-0.4-gnomevfs-embed.patch -Patch56: desktop-file-utils-0.4-file-only-show-in.patch -Patch57: desktop-file-utils-0.4-directory-nodisplay.patch +Patch57: desktop-file-utils-0.4-directory-nodisplay.patch +Patch58: desktop-file-utils-0.6-directory-change-notify.patch +Patch59: desktop-file-utils-0.6-directory-mtime.patch +Patch60: desktop-file-utils-0.6-only-show-in-api.patch +Patch61: desktop-file-utils-0.6-pleasecreate.patch + +# send to upstream +Patch101: gnome-vfs-2.5.91-schema_about_for_upstream.patch %description GNOME VFS is the GNOME virtual file system. It is the foundation of @@ -124,17 +133,22 @@ perl -pi -e 's/favorites:\s+libvfolder-desktop.so//g' $DMC %patch9 -p1 -b .no-private-methods %patch10 -p1 -b .vfolder-hacks +%patch11 -p0 -b .vfolder-hacks +%patch12 -p1 -b .mozilla # desktop-file-utils patches -%patch50 -p0 -b .spec-0.8-fix -%patch51 -p0 -b .initial-section-fix %patch52 -p0 -b .rh-schemes %patch53 -p0 -b .hide-empty-submenus %patch54 -p0 -b .menu-only-show-in %patch55 -p1 -b .embedded -%patch56 -p1 -b .file-only-show-in %patch57 -p1 -b .directory-nodisplay +%patch58 -p1 -b .directory-change-notify +%patch59 -p1 -b .directory-mtime +%patch60 -p1 -b .only-show-in-api +%patch61 -p0 -b .pleasecreate +# send to upstream +%patch101 -p1 -b .schema_about %build @@ -150,7 +164,7 @@ fi export tagname=CC make LIBTOOL=/usr/bin/libtool -(cd desktop-file-utils-0.4; +(cd desktop-file-utils-0.6; aclocal-1.6; automake-1.6; autoconf; @@ -166,7 +180,7 @@ export tagname=CC make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -(cd desktop-file-utils-0.4; +(cd desktop-file-utils-0.6; cp src/.libs/libmenu.so $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/ ) @@ -197,7 +211,7 @@ rm -fr %{buildroot} %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="system_http_proxy.schemas" +SCHEMAS="system_http_proxy.schemas system_smb.schemas desktop_gnome_url_handlers.schemas desktop_default_applications.schemas" for S in $SCHEMAS; do gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null done @@ -247,6 +261,36 @@ done %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Thu May 13 2004 Elliot Lee 2.6.0-8 +- Patch61 (desktop-file-utils-0.6-pleasecreate.patch) to fix #119446 + +* Tue May 04 2004 Dan Williams 2.6.0-7 +- Update to desktop-file-utils 0.6 +- Implement monitoring to detect addition/deletion of .desktop files +- Fix RH #118553, crash when reading symlink that points to + nothing in libmenu.so VFS backend + +* Thu Apr 22 2004 Mark McLoughlin - 2.6.0-6 +- Fix crash when .desktop files aren't readable (bug #120014) + +* Fri Apr 16 2004 Alexander Larsson 2.6.0-5 +- Make mozilla default http handler since epi might not be installed + +* Thu Apr 15 2004 Alexander Larsson 2.6.0-4 +- New cvs backport with sftp fix + +* Wed Apr 14 2004 Alexander Larsson 2.6.0-3 +- install more schemas in post + +* Wed Apr 14 2004 Alexander Larsson 2.6.0-2 +- Add cvs fixes backport + +* Tue Mar 23 2004 Alex Larsson 2.6.0-1 +- update to 2.6.0 + +* Thu Mar 18 2004 Warren Togami 2.5.91-3 +- #118614 patches 100 and 101 + * Wed Mar 17 2004 Dan Williams 2.5.91-2 - Support .directory file "NoDisplay" keys in libmenu.so VFS backend diff --git a/sources b/sources index 96045e9..b7deba9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f444b9b5e2f4607669342e73a790e1a7 desktop-file-utils-0.4.tar.gz -b0d27c7355c9e32d194938ee0ea8c3ba gnome-vfs-2.5.91.tar.bz2 +dcace3294470e9cdc9ebfe7de1881ece desktop-file-utils-0.6.tar.gz +4d0323cf015dd006210fcacd4bfe7420 gnome-vfs-2.6.0.tar.bz2