--- /home/mhz/RPM/SPECS/gnome-vfs2.spec 2005-11-15 01:36:51 +0300 +++ gnome-vfs2.spec 2006-01-05 21:42:51 +0300 @@ -1,5 +1,5 @@ %define _name gnome-vfs -%define ver_major 2.13 +%define ver_major 2.12 %define localstatedir %_var/lib %def_enable howl %def_enable hal @@ -7,8 +7,8 @@ %def_disable static Name: gnome-vfs2 -Version: %ver_major.1 -Release: alt1 +Version: %ver_major.2 +Release: alt0.1mhz1 Summary: The GNOME virtual file-system libraries Group: System/Libraries @@ -17,8 +17,6 @@ Source: ftp://ftp.gnome.org/pub/gnome/sources/%_name/%ver_major/%_name-%version.tar.bz2 Patch: %_name-2.6.1.1-alt-gnomevfs-ls.patch -# http://www.linuxfromscratch.org/blfs/downloads/svn/gnome-vfs-2.10.1-hal_0.5.0-1.patch -#Patch1: %_name-2.10.1-hal_0.5.0-1.patch Obsoletes: gnome-vfs2-extras Provides: gnome-vfs2-extras = %version-%release @@ -36,7 +34,7 @@ Requires: gnome-mime-data >= %gnome_mime_data_ver Requires: shared-mime-info >= %shared_mime_info_ver Requires: openssh-clients -Requires: fam +Requires: gamin libgamin-fam %if_enabled hal Requires: hal @@ -59,8 +57,11 @@ BuildPreReq: libcdparanoia-devel %endif -# Automatically added by buildreq on Sat Jan 29 2005 -BuildRequires: GConf2 bzlib-devel docbook-dtds docbook-style-xsl gcc-c++ glib2-devel gnome-mime-data gtk-doc libGConf2-devel libbonobo2-devel libe2fs-devel libfam-devel libgpg-error libkrb5-devel libpopt-devel libsmbclient-devel libssl-devel perl-XML-Parser xsltproc zlib-devel +BuildRequires: bzlib-devel docbook-dtds docbook-style-xsl gamin-devel +BuildRequires: glib2-devel gnome-mime-data gtk-doc libe2fs-devel +BuildRequires: libgcrypt-devel libgnutls-devel libgpg-error-devel +BuildRequires: libkrb5-devel libpopt-devel libsmbclient-devel libtasn1-devel +BuildRequires: perl-XML-Parser pkgconfig xml-common xsltproc zlib-devel %description GNOME VFS is the GNOME virtual file system. It is the foundation of the @@ -119,8 +120,7 @@ %prep %setup -q -n %_name-%version -%patch -p1 -#%%patch1 -p1 +%patch0 -p1 %build export ac_cv_prog_AWK=/bin/awk @@ -130,6 +130,8 @@ %{subst_enable howl} \ %{subst_enable hal} \ %{subst_enable cdda} \ + --enable-gnutls \ + --disable-openssl \ --disable-schemas-install \ --localstatedir=%localstatedir \ --enable-gtk-doc @@ -150,12 +152,9 @@ %__bzip2 -9fk ChangeLog -#%%gconf2_stripschemas %find_lang --output=files_list %_name-2.0 + %define schemas desktop_default_applications desktop_gnome_url_handlers system_http_proxy system_smb system_dns_sd system_storage -for s in %schemas; do - echo "%%config %_sysconfdir/gconf/schemas/$s.schemas" -done >>files_list %post %gconf2_install %schemas @@ -176,12 +175,10 @@ %_libexecdir/gnome-vfs-daemon %_libdir/bonobo/monikers/*.so %_libdir/bonobo/servers/* -#%_datadir/gconf/locale/* %dir %_sysconfdir/gnome-vfs-2.0 %dir %_sysconfdir/gnome-vfs-2.0/modules %config %_sysconfdir/gnome-vfs-2.0/*/* %config %_sysconfdir/gconf/schemas/*.schemas -#%%config %_sysconfdir/gconf/schemas/%{expand: %(echo %schemas | sed -e 's/ /,/g')}.schemas %doc AUTHORS ChangeLog.* NEWS README %files devel @@ -206,6 +203,12 @@ %_bindir/* %changelog +* Thu Jan 05 2006 Mikhail Zabaluev 2.12.2-alt0.1mhz1 +- Reverted to 2.12 branch +- Use Gamin instead of FAM +- Use GnuTLS instead of OpenSSL +- Spec cleanup + * Tue Nov 15 2005 Alexey Rusakov 2.13.1-alt1 - new version