SPECS (AC-branch): gnome-vfs2.spec - back to AC dependencies, drop...

[freetz]

Author: freetz                       Date: Fri Jul  8 20:00:11 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- back to AC dependencies, droped hal bcond

---- Files affected:
SPECS:
   gnome-vfs2.spec (1.158 -> 1.158.2.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-vfs2.spec
diff -u SPECS/gnome-vfs2.spec:1.158 SPECS/gnome-vfs2.spec:1.158.2.1
--- SPECS/gnome-vfs2.spec:1.158	Wed Jul  6 21:39:39 2005
+++ SPECS/gnome-vfs2.spec	Fri Jul  8 22:00:02 2005
@@ -1,8 +1,4 @@
 # $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
@@ -15,7 +11,6 @@
 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.23
 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.4.7
 BuildRequires:	heimdal-devel >= 0.7
 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.4.7
 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
+
 %{__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.158.2.1  2005/07/08 20:00:02  freetz
+- back to AC dependencies, droped hal bcond
+
 Revision 1.158  2005/07/06 19:39:39  arekm
 - br heimdal >= 0.7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.158&r2=1.158.2.1&f=u