SPECS (DEVEL): gnome-vfs2.spec - cdda method disabled by default (...

[freetz]

Author: freetz                       Date: Sun Aug  7 20:31:18 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- cdda method disabled by default (BR: cdparanoia remoed), added bunch of
  ubuntu/debian patches (small fixes / hal related fixes), cleanup, rel.3

---- Files affected:
SPECS:
   gnome-vfs2.spec (1.157.2.6 -> 1.157.2.7) 

---- Diffs:

================================================================
Index: SPECS/gnome-vfs2.spec
diff -u SPECS/gnome-vfs2.spec:1.157.2.6 SPECS/gnome-vfs2.spec:1.157.2.7
--- SPECS/gnome-vfs2.spec:1.157.2.6	Sun Aug  7 20:46:17 2005
+++ SPECS/gnome-vfs2.spec	Sun Aug  7 22:31:13 2005
@@ -3,7 +3,7 @@
 Summary(pl):	GNOME2 - wirtualny system plików
 Name:		gnome-vfs2
 Version:	2.11.90
-Release:	2
+Release:	3
 License:	LGPL v2+
 Group:		Applications
 Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.11/gnome-vfs-%{version}.tar.bz2
@@ -11,13 +11,17 @@
 Source1:	%{name}-defaults.list
 Patch0:		%{name}-defaults-path.patch
 Patch1:		%{name}-no_g_mime.patch
+Patch2:		%{name}-fstab_edit_crash.patch
+Patch3:		%{name}-get_volume_for_path.patch
+Patch4:		%{name}-user_visible_drives.patch
+Patch5:		%{name}-resolve_fstab_symlinks.patch
+Patch6:		%{name}-disable_cdda.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.10.0
 BuildRequires:	ORBit2-devel >= 1:2.12.1
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
-BuildRequires:	cdparanoia-III-devel
 BuildRequires:	dbus-glib-devel >= 0.34
 BuildRequires:	docbook-dtd412-xml >= 1.0-10
 BuildRequires:	fam-devel
@@ -94,6 +98,11 @@
 %setup -q -n gnome-vfs-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 # force rebuild
@@ -107,9 +116,11 @@
 	--with-html-dir=%{_gtkdocdir} \
 	--disable-schemas-install \
 	--enable-ipv6 \
+	--with-hal-mount=/usr/bin/pmount \
+	--with-hal-umount=/usr/bin/pumount \
+	--with-hal-eject=/usr/bin/eject
 
-# check -DMOUNT_ARGUMENT=\\\"-s\\\"" before 2.12
-%{__make} CFLAGS="%{rpmcflags} -DMOUNT_ARGUMENT=\\\"-s\\\""
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -187,6 +198,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157.2.7  2005/08/07 20:31:13  freetz
+- cdda method disabled by default (BR: cdparanoia remoed), added bunch of
+  ubuntu/debian patches (small fixes / hal related fixes), cleanup, rel.3
+
 Revision 1.157.2.6  2005/08/07 18:46:17  freetz
 - yes, it works now, rel.2
 
================================================================

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