auto-import changelog data from gnome-vfs2-2.0.2-2.src.rpm

Tue Aug 13 2002 Havoc Pennington <hp@redhat.com> - don't include pointless .a files Fri Aug 02 2002 Havoc Pennington <hp@redhat.com> - 2.0.2 - use vfolders for system-settings and server-settings Tue Jul 16 2002 Havoc Pennington <hp@redhat.com> - fix OnlyShowIn Tue Jun 25 2002 Owen Taylor <otaylor@redhat.com> - Version 2.0.1, fix missing po files Sun Jun 16 2002 Havoc Pennington <hp@redhat.com> - 2.0.0 - put schema files in file list, and install them - put libdir/vfs in file list
20 years ago · 7e150ba128
parent 6385709b37
commit 7e150ba128
4 changed files with 69 additions and 12 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-gnome-vfs-1.9.16.tar.bz2
+gnome-vfs-2.0.2.tar.bz2
--- a/gnome-vfs-2.0.1-only-show-in.patch
+++ b/gnome-vfs-2.0.1-only-show-in.patch
@ -0,0 +1,13 @@
+--- gnome-vfs-2.0.1/modules/vfolder-desktop-method.c.only-show-in	Tue Jul 16 20:11:46 2002
+++ gnome-vfs-2.0.1/modules/vfolder-desktop-method.c	Tue Jul 16 20:12:21 2002
+@@ -2466,8 +2466,8 @@
+ 
+ 		*result = g_strdup (p);
+ 
+-		if (*result1 == NULL ||
+-		    (result2 != NULL && *result2 == NULL))
+		if (*result1 != NULL &&
+		    (result2 == NULL || *result2 != NULL))
+ 			break;
+ 	}
+ 
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@ -1,13 +1,15 @@
 %define libbonobo_version 2.0.0
-%define gconf2_version 1.1.11
+%define gconf2_version 1.2.0
 %define gtkdoc_version 0.9
-%define gnome_mime_data_version 1.0.8
+%define gnome_mime_data_version 2.0.0
 %define redhat_menus_version 0.2

+%define po_package gnome-vfs-2.0
+
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
-Version: 1.9.16
-Release: 5
+Version: 2.0.2
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: gnome-vfs-%{version}.tar.bz2
@ -17,6 +19,7 @@ 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: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: bonobo-activation-devel, glib2-devel, libxml2-devel, zlib-devel
 BuildRequires: popt, bzip2-devel, ORBit2-devel, XFree86-devel, openjade
 BuildRequires: pkgconfig
@ -26,6 +29,8 @@ BuildRequires: gtk-doc >= %{gtkdoc_version}

 Patch1: gnome-vfs-1.9.4.91-docdir.patch
 Patch2: gnome-vfs-1.9.16-moved-menu-files.patch
+Patch3: gnome-vfs-2.0.1-only-show-in.patch
+Patch4: gnome-vfs-2.0.2-start-here-vfolders.patch

 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
@ -54,35 +59,57 @@ GNOME VFS modules and applications that use the GNOME VFS APIs.
 #%patch1 -p1 -b .docdir

 %patch2 -p1 -b .moved-menu-files
+%patch3 -p1 -b .only-show-in
+%patch4 -p1 -b .start-here-vfolders.patch

 %build
-automake-1.4
+# patch1 is disabled, so we don't need this
+#automake-1.4
 %configure

 make

 %install
 rm -fr %{buildroot}
+
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

-%find_lang %name
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.a
+
+%find_lang %{po_package}

 %clean
 rm -fr %{buildroot}

-%post -p /sbin/ldconfig
+%post
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+SCHEMAS="system_http_proxy.schemas"
+for S in $SCHEMAS; do
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+done
+
+/sbin/ldconfig

 %postun -p /sbin/ldconfig

-%files -f %{name}.lang
+%files -f %{po_package}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
+
+%dir %{_sysconfdir}/gnome-vfs-2.0
+%dir %{_sysconfdir}/gnome-vfs-2.0/modules
+%dir %{_sysconfdir}/gnome-vfs-2.0/vfolders
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
 %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
+%{_libdir}/vfs
+%{_sysconfdir}/gconf/schemas/*
 ## conflicts with gnome-vfs 1, ignore for now
 ## %{_datadir}/man/man5/*

@ -92,11 +119,28 @@ rm -fr %{buildroot}
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_libdir}/gnome-vfs-2.0/include/*.h
-%{_libdir}/gnome-vfs-2.0/modules/*.a
 %{_includedir}/*
-%{_datadir}/gtk-doc/*
+%{_datadir}/gtk-doc

 %changelog
+* Tue Aug 13 2002 Havoc Pennington <hp@redhat.com>
+- don't include pointless .a files
+
+* Fri Aug  2 2002 Havoc Pennington <hp@redhat.com>
+- 2.0.2
+- use vfolders for system-settings and server-settings
+
+* Tue Jul 16 2002 Havoc Pennington <hp@redhat.com>
+- fix OnlyShowIn
+
+* Tue Jun 25 2002 Owen Taylor <otaylor@redhat.com>
+- Version 2.0.1, fix missing po files
+
+* Sun Jun 16 2002 Havoc Pennington <hp@redhat.com>
+- 2.0.0
+- put schema files in file list, and install them
+- put libdir/vfs in file list
+
 * Tue Jun 11 2002 Havoc Pennington <hp@redhat.com>
 - rebuild in different environment

--- a/2
+++ b/2
@ -1 +1 @@
-161ccd037041ae92fd742ac4705b4bb6  gnome-vfs-1.9.16.tar.bz2
+5d96a9d6d8cf06663edfcfce01f61314  gnome-vfs-2.0.2.tar.bz2