@ -3,20 +3,20 @@
%define gconf2_version 1.2.0
%define gconf2_version 1.2.0
%define gtkdoc_version 0.9
%define gtkdoc_version 0.9
%define gnome_mime_data_version 2.0.0-11
%define gnome_mime_data_version 2.0.0-11
%define redhat_menus_version 0.3 0
%define redhat_menus_version 1. 0
%define perl_XML_Parser_version 2.31-16
%define perl_XML_Parser_version 2.31-16
%define po_package gnome-vfs-2.0
%define po_package gnome-vfs-2.0
Summary: The GNOME virtual file-system libraries.
Summary: The GNOME virtual file-system libraries.
Name: gnome-vfs2
Name: gnome-vfs2
Version: 2.5.6
Version: 2.5.91
Release: 1
Release: 2
License: LGPL
License: LGPL
Group: System Environment/Libraries
Group: System Environment/Libraries
Source: gnome-vfs-%{version}.tar.bz2
Source: gnome-vfs-%{version}.tar.bz2
Source2: vfolder-desktop-method.c
Source2: vfolder-desktop-method.c
Source3: desktop-method.c
Source3: desktop-method.c
Source4: gtk-doc.make
Source4: desktop-file-utils-0.4.tar.gz
URL: http://www.gnome.org/
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -34,28 +34,33 @@ BuildRequires: /usr/bin/automake-1.6
BuildRequires: gtk-doc >= %{gtkdoc_version}
BuildRequires: gtk-doc >= %{gtkdoc_version}
BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
BuildRequires: samba-common >= %{samba_version}
BuildRequires: samba-common >= %{samba_version}
BuildRequires: openssl-devel fam-devel
Prereq: GConf2 >= %{gconf2_version}
Prereq: GConf2 >= %{gconf2_version}
Patch1: gnome-vfs-1.9.16-moved-menu-files.patch
Patch1: gnome-vfs-1.9.4.91-docdir.patch
Patch2: gnome-vfs-2.0.1-only-show-in.patch
Patch2: gnome-vfs-2.1.3-moved-menu-files.patch
Patch3: gnome-vfs-2.5.90-modules-conf.patch
Patch3: gnome-vfs-2.0.4-onlyshowin.patch
Patch4: gnome-vfs-2.0.2-newstat.patch
Patch5: gnome-vfs-2.0.2-read-only.patch
Patch5: gnome-vfs-1.9.16-moved-menu-files.patch
Patch6: gnome-vfs-2.0.1-only-show-in.patch
Patch7: gnome-vfs-2.5.5-modules-conf.patch
Patch8: gnome-vfs-2.0.2-newstat.patch
Patch9: gnome-vfs-2.0.2-read-only.patch
## this is the automake-requiring patch
## this is the automake-requiring patch
Patch10 : gnome-vfs-2.1.6-old-modules.patch
Patch6: gnome-vfs-2.1.6-old-modules.patch
Patch11: gnome-vfs-2.1.6-network-uri.patch
Patch7: gnome-vfs-2.1.6-never-show-if-empty.patch
Patch12: gnome-vfs-2.1.6-never-show-if-empty.patch
Patch8: gnome-vfs-2.1.6-hide-with-empty-subfolders.patch
Patch13: gnome-vfs-2.1.6-hide-with-empty-subfolders.patch
Patch9: gnome-vfs-2.1.6-no-private-methods.patch
Patch14: gnome-vfs-2.1.6-no-private-methods.patch
Patch15: gnome-vfs2-2.5.5-vfolder-hacks.patch
Patch10: gnome-vfs2-2.5.5-vfolder-hacks.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
%description
%description
GNOME VFS is the GNOME virtual file system. It is the foundation of
GNOME VFS is the GNOME virtual file system. It is the foundation of
@ -91,14 +96,10 @@ This package provides support for reading and writing files on windows
shares (SMB) to applications using GNOME VFS.
shares (SMB) to applications using GNOME VFS.
%prep
%prep
%setup -q -n gnome-vfs-%{version}
%setup -q -n gnome-vfs-%{version} -a 4
cp -f %{SOURCE2} modules
cp -f %{SOURCE2} modules
cp -f %{SOURCE3} modules
cp -f %{SOURCE3} modules
cp -f %{SOURCE4} .
# Patch1: gnome-vfs-1.9.4.91-docdir.patch modifies doc/Makefile.am
#%patch1 -p1 -b .docdir
(cd modules && cp default-modules.conf default-modules.conf.with-menu-editing)
(cd modules && cp default-modules.conf default-modules.conf.with-menu-editing)
@ -107,34 +108,36 @@ DMC=modules/default-modules.conf.with-menu-editing
perl -pi -e 's/all-applications:\s+libvfolder-desktop.so//g' $DMC
perl -pi -e 's/all-applications:\s+libvfolder-desktop.so//g' $DMC
perl -pi -e 's/all-preferences:\s+libvfolder-desktop.so//g' $DMC
perl -pi -e 's/all-preferences:\s+libvfolder-desktop.so//g' $DMC
perl -pi -e 's/favorites:\s+libvfolder-desktop.so//g' $DMC
perl -pi -e 's/favorites:\s+libvfolder-desktop.so//g' $DMC
perl -pi -e 's/network:\s+libvfolder-desktop.so//g' $DMC
## these two should actually work
## these two should actually work
## perl -pi -e 's/applications-all-users:\s+libvfolder-desktop.so//g' $DMC
## perl -pi -e 's/applications-all-users:\s+libvfolder-desktop.so//g' $DMC
## perl -pi -e 's/preferences-all-users:\s+libvfolder-desktop.so//g' $DMC
## perl -pi -e 's/preferences-all-users:\s+libvfolder-desktop.so//g' $DMC
## these are now in the vfolder-hacks patch
%patch1 -p1 -b .moved-menu-files
#%patch2 -p1 -b .moved-menu-files
%patch2 -p1 -b .only-show-in
#%patch3 -p0 -b .onlyshowin
%patch3 -p1 -b .modules-conf
%patch4 -p1 -b .newstat
%patch5 -p1 -b .read-only
%patch6 -p1 -b .old-modules
%patch7 -p1 -b .never-show-if-empty
%patch8 -p1 -b .hide-with-empty-subfolders
%patch9 -p1 -b .no-private-methods
%patch10 -p1 -b .vfolder-hacks
# 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
%patch5 -p1 -b .moved-menu-files
%patch6 -p1 -b .only-show-in
%patch7 -p1 -b .modules-conf
%patch8 -p1 -b .newstat
%patch9 -p1 -b .read-only
%patch10 -p1 -b .old-modules
%patch11 -p1 -b .network-uri
%patch12 -p1 -b .never-show-if-empty
%patch13 -p1 -b .hide-with-empty-subfolders
%patch14 -p1 -b .no-private-methods
%patch15 -p1 -b .vfolder-hacks
%build
%build
#workaround broken perl-XML-Parser on 64bit arches
export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
# needed for patch10 (changing makefile to old vfolder backend)
# needed for patch10 (changing makefile to old vfolder backend)
aclocal-1.6
aclocal-1.6
automake-1.6
automake-1.6
@ -142,34 +145,48 @@ if pkg-config openssl ; then
CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
fi
fi
%configure
%configure --enable-gtk-doc --with-gtk=no
export tagname=CC
export tagname=CC
make LIBTOOL=/usr/bin/libtool
make LIBTOOL=/usr/bin/libtool
(cd desktop-file-utils-0.4;
aclocal-1.6;
automake-1.6;
autoconf;
%configure;
make LIBTOOL=/usr/bin/libtool
)
%install
%install
rm -fr %{buildroot}
rm -fr %{buildroot}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
export tagname=CC
export tagname=CC
%makeinstall LIBTOOL=/usr/bin/libtool
make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
(cd desktop-file-utils-0.4;
cp src/.libs/libmenu.so $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/
)
rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# Remove older gnome-vfs2 menu module
rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libvfolder-deskto*.so
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/vfolders/*.vfolder-info
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/vfolders/*.vfolder-info
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/vfolders/*.vfolder-info-default
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/vfolders/*.vfolder-info-default
## why, dear god, why?
rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/gob2.m4
install -m 644 modules/default-modules.conf.with-menu-editing $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/
install -m 644 modules/default-modules.conf.with-menu-editing $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/
## Remove this line and update file list to revert to
## Remove this line and update file list to revert to
## no-menu-editing-by-default
## no-menu-editing-by-default
# (cd $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/; mv default-modules.conf default-modules.conf.without-menu-editing; mv default-modules.conf.with-menu-editing default-modules.conf)
# (cd $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/; mv default-modules.conf default-modules.conf.without-menu-editing; mv default-modules.conf.with-menu-editing default-modules.conf)
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.2.0/filesystems/*.{a,la}
rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la}
rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la}
%find_lang %{po_package}
%find_lang %{po_package}
@ -197,7 +214,7 @@ done
%dir %{_sysconfdir}/gnome-vfs-2.0/modules
%dir %{_sysconfdir}/gnome-vfs-2.0/modules
#%dir %{_sysconfdir}/gnome-vfs-2.0/vfolders
#%dir %{_sysconfdir}/gnome-vfs-2.0/vfolders
%config %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
%config %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
%exclude %{_sysconfdir}/gnome-vfs-2.0/modules/ssl-modules .conf
%exclude %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module .conf
%config %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf.with-menu-editing
%config %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf.with-menu-editing
## we aren't really using the .vfolder-info config files,
## we aren't really using the .vfolder-info config files,
## so installing them is a little misleading.
## so installing them is a little misleading.
@ -220,17 +237,62 @@ done
%{_libdir}/lib*.a
%{_libdir}/lib*.a
%{_libdir}/lib*.so
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%{_libdir}/pkgconfig/*
%{_libdir}/gnome-vfs-2.0/include/*.h
%{_libdir}/gnome-vfs-2.0/include
%{_includedir}/*
%{_includedir}/*
%{_datadir}/gtk-doc
%{_datadir}/gtk-doc
%{_libdir}/gnome-vfs-2.0/modules
%files smb
%files smb
%defattr(-, root, root)
%defattr(-, root, root)
%{_libdir}/gnome-vfs-2.0/modules/libsmb.so
%{_libdir}/gnome-vfs-2.0/modules/libsmb.so
%config %{_sysconfdir}/gnome-vfs-2.0/modules/ssl-modules .conf
%config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module .conf
%changelog
%changelog
* Wed Mar 17 2004 Dan Williams <dcbw@redhat.com> 2.5.91-2
- Support .directory file "NoDisplay" keys in libmenu.so VFS backend
* Mon Mar 15 2004 Alex Larsson <alexl@redhat.com> 2.5.91-1
- update to 2.5.91
* Fri Mar 12 2004 Dan Williams <dcbw@redhat.com> 2.5.90-3
- Make OnlyShowIn for .desktop files actually work
* Thu Mar 11 2004 Dan Williams <dcbw@redhat.com> 2.5.90-2
- Add desktop-file-utils to build the new libmenu.so VFS backend
for .menu files. Its a hack for now, and will eventually
be replaced by upstreaming the d-f-u code
* Mon Mar 8 2004 Alexander Larsson <alexl@redhat.com> 2.5.90-1
- update to 2.5.90
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Feb 25 2004 Alexander Larsson <alexl@redhat.com> 2.5.8-2
- fix some packaging issues (#115807)
* Mon Feb 23 2004 Alexander Larsson <alexl@redhat.com> 2.5.8-1
- update to 2.5.8
- fix smb filelist
- add devel docs
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Fri Feb 13 2004 Alexander Larsson <alexl@redhat.com> 2.5.7-1
- update to 2.5.7
* Mon Feb 9 2004 Alexander Larsson <alexl@redhat.com> 2.5.6-4
- build-req fam-devel and openssl-devel (#111109)
- Own libdir/gnome-vfs-2.0/include (#113045)
* Fri Feb 6 2004 Alexander Larsson <alexl@redhat.com> 2.5.6-3
- Clean up the patch list
- Fix the network: issue
- Remove core file from tarball
* Thu Feb 5 2004 Alexander Larsson <alexl@redhat.com> 2.5.6-2
- Fix daemon server file
* Fri Jan 30 2004 Alexander Larsson <alexl@redhat.com> 2.5.6-1
* Fri Jan 30 2004 Alexander Larsson <alexl@redhat.com> 2.5.6-1
- update to 2.5.6
- update to 2.5.6