From 6385709b3707b262fdaab6d283fb31362adf80dc Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:38:31 +0000 Subject: [PATCH] auto-import changelog data from gnome-vfs2-1.9.16-5.src.rpm Tue Jun 11 2002 Havoc Pennington - rebuild in different environment Tue Jun 11 2002 Havoc Pennington - look for menus in redhat-menus Fri Jun 07 2002 Havoc Pennington - rebuild in different environment Wed Jun 05 2002 Havoc Pennington - 1.9.16 Sun May 26 2002 Tim Powers - automated rebuild Mon May 20 2002 Havoc Pennington - rebuild in different environment Mon May 20 2002 Havoc Pennington - 1.9.15 - comment out docdir patch for now Fri May 03 2002 Havoc Pennington - 1.9.14 Thu Apr 04 2002 Jeremy Katz - 1.9.11 - update file list Thu Feb 14 2002 Havoc Pennington - 1.9.7 Thu Jan 31 2002 Owen Taylor - Fix location of installed docs not to conflict with gnome-vfs1 Wed Jan 30 2002 Owen Taylor - Rebuild with new libs Wed Jan 09 2002 Tim Powers - automated rebuild --- .cvsignore | 2 +- gnome-vfs-1.9.16-moved-menu-files.patch | 14 ++++ gnome-vfs2.spec | 89 ++++++++++++++++++++----- sources | 2 +- 4 files changed, 88 insertions(+), 19 deletions(-) create mode 100644 gnome-vfs-1.9.16-moved-menu-files.patch diff --git a/.cvsignore b/.cvsignore index 398b6ac..f7b057b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-vfs-1.9.4.91.tar.gz +gnome-vfs-1.9.16.tar.bz2 diff --git a/gnome-vfs-1.9.16-moved-menu-files.patch b/gnome-vfs-1.9.16-moved-menu-files.patch new file mode 100644 index 0000000..d7ea0f2 --- /dev/null +++ b/gnome-vfs-1.9.16-moved-menu-files.patch @@ -0,0 +1,14 @@ +--- gnome-vfs-1.9.16/modules/vfolder-desktop-method.c.moved-menu-files Tue Jun 11 17:39:20 2002 ++++ gnome-vfs-1.9.16/modules/vfolder-desktop-method.c Tue Jun 11 17:43:17 2002 +@@ -1433,9 +1433,8 @@ + + info->scheme = g_strdup (scheme); + +- info->filename = g_strconcat (SYSCONFDIR, +- "/gnome-vfs-2.0/vfolders/", +- scheme, ".vfolder-info", ++ info->filename = g_strconcat (SYSCONFDIR, "/X11/desktop-menus/", ++ scheme, ".menu", + NULL); + info->user_filename = g_strconcat (g_get_home_dir (), + "/" DOT_GNOME "/vfolders/", diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index 115c33f..aa720a0 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -1,24 +1,31 @@ -# Note that this is NOT a relocatable package - -%define libbonobo_version 1.108.0.90 -%define gconf2_version 1.1.5.90 +%define libbonobo_version 2.0.0 +%define gconf2_version 1.1.11 +%define gtkdoc_version 0.9 +%define gnome_mime_data_version 1.0.8 +%define redhat_menus_version 0.2 Summary: The GNOME virtual file-system libraries. -Name: gnome-vfs2 -Version: 1.9.4.91 -Release: 1 -License: LGPL +Name: gnome-vfs2 +Version: 1.9.16 +Release: 5 +License: LGPL Group: System Environment/Libraries -Source: gnome-vfs-%{version}.tar.gz -URL: http://www.gnome.org/ +Source: gnome-vfs-%{version}.tar.bz2 +URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: gnome-mime-data +Requires: gnome-mime-data >= %{gnome_mime_data_version} +Requires: redhat-menus >= %{redhat_menus_version} BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: GConf2-devel >= %{gconf2_version} BuildRequires: bonobo-activation-devel, glib2-devel, libxml2-devel, zlib-devel BuildRequires: popt, bzip2-devel, ORBit2-devel, XFree86-devel, openjade BuildRequires: pkgconfig -BuildRequires: gnome-mime-data +BuildRequires: gnome-mime-data >= %{gnome_mime_data_version} +BuildRequires: /usr/bin/automake-1.4 +BuildRequires: gtk-doc >= %{gtkdoc_version} + +Patch1: gnome-vfs-1.9.4.91-docdir.patch +Patch2: gnome-vfs-1.9.16-moved-menu-files.patch %description GNOME VFS is the GNOME virtual file system. It is the foundation of @@ -43,15 +50,19 @@ GNOME VFS modules and applications that use the GNOME VFS APIs. %prep %setup -q -n gnome-vfs-%{version} +# Patch1: gnome-vfs-1.9.4.91-docdir.patch modifies doc/Makefile.am +#%patch1 -p1 -b .docdir + +%patch2 -p1 -b .moved-menu-files %build +automake-1.4 %configure make %install rm -fr %{buildroot} - %makeinstall %find_lang %name @@ -66,11 +77,12 @@ rm -fr %{buildroot} %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README - %config %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf -%{_libdir}/lib*.so.* -%{_libdir}/gnome-vfs-2.0 -%{_libdir}/bonobo/* +%config %{_sysconfdir}/gnome-vfs-2.0/vfolders/*.vfolder-info +%{_libdir}/*.so.* +%{_libdir}/gnome-vfs-2.0/modules +%dir %{_libdir}/gnome-vfs-2.0 +%{_libdir}/bonobo ## conflicts with gnome-vfs 1, ignore for now ## %{_datadir}/man/man5/* @@ -79,10 +91,53 @@ rm -fr %{buildroot} %{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/* +%{_libdir}/gnome-vfs-2.0/include/*.h +%{_libdir}/gnome-vfs-2.0/modules/*.a %{_includedir}/* %{_datadir}/gtk-doc/* %changelog +* Tue Jun 11 2002 Havoc Pennington +- rebuild in different environment + +* Tue Jun 11 2002 Havoc Pennington +- look for menus in redhat-menus + +* Fri Jun 07 2002 Havoc Pennington +- rebuild in different environment + +* Wed Jun 5 2002 Havoc Pennington +- 1.9.16 + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Mon May 20 2002 Havoc Pennington +- rebuild in different environment + +* Mon May 20 2002 Havoc Pennington +- 1.9.15 +- comment out docdir patch for now + +* Fri May 3 2002 Havoc Pennington +- 1.9.14 + +* Thu Apr 4 2002 Jeremy Katz +- 1.9.11 +- update file list + +* Thu Feb 14 2002 Havoc Pennington +- 1.9.7 + +* Thu Jan 31 2002 Owen Taylor +- Fix location of installed docs not to conflict with gnome-vfs1 + +* Wed Jan 30 2002 Owen Taylor +- Rebuild with new libs + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + * Thu Jan 3 2002 Havoc Pennington - 1.0.4.91 snap diff --git a/sources b/sources index ebca19c..8d79fc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68043225d761db06638cbd3286404c05 gnome-vfs-1.9.4.91.tar.gz +161ccd037041ae92fd742ac4705b4bb6 gnome-vfs-1.9.16.tar.bz2