From 3081f59ad4a50e6e571e2143c4ac04eb6fbd19ebc2c2d2ba985bcf02a517837c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 25 May 2012 09:27:42 +0000 Subject: [PATCH] Accepting request 122041 from home:vuntz:branches:GNOME:Factory Disable cdda backend for now, needed for beta OBS-URL: https://build.opensuse.org/request/show/122041 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=145 --- gvfs.changes | 8 ++++++++ gvfs.spec | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/gvfs.changes b/gvfs.changes index bcdf4ed..c23e266 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 24 09:48:58 UTC 2012 - vuntz@opensuse.org + +- Disable the build of cdda backend with a with_cdda %define (set + to 0 for now), as libcdio-paranoia got split from libcdio. If + %with_cdda is set to 0, just don't use the libcdio-devel + BuildRequires. + ------------------------------------------------------------------- Wed May 16 06:11:51 UTC 2012 - vuntz@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index ee139ed..cccc4bf 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -17,6 +17,7 @@ %define with_udisks2 1 +%define with_cdda 0 Name: gvfs Version: 1.12.3 @@ -38,7 +39,9 @@ BuildRequires: glib2-devel >= 2.31.0 BuildRequires: intltool BuildRequires: libarchive-devel BuildRequires: libavahi-glib-devel +%if %{with_cdda} BuildRequires: libcdio-devel +%endif BuildRequires: libexpat-devel BuildRequires: libgcrypt-devel %if !%{with_udisks2} @@ -219,8 +222,10 @@ rm -rf %{buildroot} %{_datadir}/%{name}/mounts/archive.mount %{_libexecdir}/%{name}/gvfsd-burn %{_datadir}/%{name}/mounts/burn.mount +%if %{with_cdda} %{_libexecdir}/%{name}/gvfsd-cdda %{_datadir}/%{name}/mounts/cdda.mount +%endif %{_libexecdir}/%{name}/gvfsd-computer %{_datadir}/%{name}/mounts/computer.mount %{_libexecdir}/%{name}/gvfsd-dav