Author: freetz Date: Sun Jul 3 15:15:30 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.3, dropped hal bcond (mandatory), dropped obsoleted hal patch
---- Files affected: SPECS: gnome-vfs2.spec (1.157 -> 1.157.2.1) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157 SPECS/gnome-vfs2.spec:1.157.2.1 --- SPECS/gnome-vfs2.spec:1.157 Thu May 19 21:34:59 2005 +++ SPECS/gnome-vfs2.spec Sun Jul 3 17:15:25 2005 @@ -1,21 +1,16 @@ # $Revision$, $Date$ -# -# Conditional build: -%bcond_without hal # don't use hal -# Summary: GNOME2 - virtual file system Summary(pl): GNOME2 - wirtualny system plików Name: gnome-vfs2 -Version: 2.10.1 -Release: 4 +Version: 2.11.3 +Release: 1 License: LGPL v2+ Group: Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.10/gnome-vfs-%{version}.tar.bz2 -# Source0-md5: 88b520e5de748a310a2aef62fc095c8b +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.11/gnome-vfs-%{version}.tar.bz2 +# Source0-md5: 821407dab314c0a0fab9f84fe095148a Source1: %{name}-defaults.list Patch0: %{name}-defaults-path.patch Patch1: %{name}-no_g_mime.patch -Patch2: %{name}-hal.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: ORBit2-devel >= 1:2.12.1 @@ -23,7 +18,7 @@ BuildRequires: automake BuildRequires: bzip2-devel BuildRequires: cdparanoia-III-devel -%{?with_hal:BuildRequires: dbus-glib-devel >= 0.33} +BuildRequires: dbus-glib-devel >= 0.34 BuildRequires: docbook-dtd412-xml >= 1.0-10 BuildRequires: fam-devel BuildRequires: flex @@ -33,7 +28,7 @@ BuildRequires: gnome-doc-tools BuildRequires: gtk+2-devel >= 2:2.6.2 BuildRequires: gtk-doc >= 1.1 -%{?with_hal:BuildRequires: hal-devel >= 0.5.2} +BuildRequires: hal-devel >= 0.5.2 BuildRequires: heimdal-devel BuildRequires: howl-devel >= 0.9.10 BuildRequires: intltool >= 0.30 @@ -50,7 +45,7 @@ BuildRequires: zlib-devel Requires(post): /sbin/ldconfig Requires(post,preun): GConf2 -%{?with_hal:Requires: hal-libs >= 0.5.2} +Requires: hal-libs >= 0.5.2 Requires: howl-libs >= 0.9.10 Requires: libbonobo >= 2.8.1 Requires: shared-mime-info >= 0.15 @@ -99,7 +94,6 @@ %setup -q -n gnome-vfs-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p0 %build %{__libtoolize} @@ -111,11 +105,8 @@ --with-html-dir=%{_gtkdocdir} \ --disable-schemas-install \ --enable-ipv6 \ -%if %{with hal} - --enable-hal -%else - --disable-hal -%endif + +# check -DMOUNT_ARGUMENT=\\\"-s\\\"" before 2.12 %{__make} CFLAGS="%{rpmcflags} -DMOUNT_ARGUMENT=\\\"-s\\\"" %install @@ -192,6 +183,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.157.2.1 2005/07/03 15:15:25 freetz +- 2.11.3, dropped hal bcond (mandatory), dropped obsoleted hal patch + Revision 1.157 2005/05/19 19:34:59 wrobell - support for hal 0.5.2 added - rel. 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157&r2=1.157.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
