From 9b44b2881f83a08daf8a1590900d4099b8cf2eb5 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Jan 17 2007 00:40:11 +0000 Subject: Added patch to support libisofs.so.4 and libburn.so.6 --- diff --git a/brasero-0.5.1-isofs.patch b/brasero-0.5.1-isofs.patch new file mode 100644 index 0000000..3a9280d --- /dev/null +++ b/brasero-0.5.1-isofs.patch @@ -0,0 +1,68 @@ +--- brasero-0.5.1/src/burn-libisofs.c~ 2006-11-13 20:51:32.000000000 +0100 ++++ brasero-0.5.1/src/burn-libisofs.c 2007-01-17 01:00:02.000000000 +0100 +@@ -46,7 +46,7 @@ + + #ifdef HAVE_LIBBURN + +-#include ++#include + #include + + static void brasero_libisofs_class_init (BraseroLibisofsClass *klass); +--- brasero-0.5.1/src/burn-libburn-common.c~ 2006-09-16 10:06:14.000000000 +0200 ++++ brasero-0.5.1/src/burn-libburn-common.c 2007-01-17 01:07:11.000000000 +0100 +@@ -247,38 +247,6 @@ + return BRASERO_BURN_OK; + } + +-static gboolean +-brasero_libburn_common_process_message (BraseroLibburnCommon *self, +- struct burn_message *mes) +-{ +- GError *error; +- gboolean retval = TRUE; +- +- switch (mes->type) { +- case BURN_MESSAGE_ERROR: +- if (mes->detail.error.message == BURN_ERROR_CANCELLED) { +- retval = TRUE; +- break; +- } +- +- case BURN_MESSAGE_WARNING: +- error = g_error_new (BRASERO_BURN_ERROR, +- BRASERO_BURN_ERROR_GENERAL, +- _("an unknown error occured with libburn")); +- brasero_job_error (BRASERO_JOB (self), error); +- retval = FALSE; +- break; +- +- case BURN_MESSAGE_INFO: +- BRASERO_JOB_LOG (self, _("(%s) libburn tried to say something")); +- retval = TRUE; +- break; +- } +- +- burn_message_free (mes); +- return retval; +-} +- + static void + brasero_libburn_common_status_changed (BraseroLibburnCommon *self, + enum burn_drive_status status, +@@ -381,15 +349,9 @@ + gdouble fraction; + gint64 sectors; + +- struct burn_message *message; + enum burn_drive_status status; + struct burn_progress progress; + +- /* see if there is any pending message */ +- message = burn_get_message (); +- if (message && !brasero_libburn_common_process_message (self, message)) +- return; +- + if (!self->priv->drive) + return; + diff --git a/brasero.spec b/brasero.spec index 48a000d..f711009 100644 --- a/brasero.spec +++ b/brasero.spec @@ -1,12 +1,13 @@ Name: brasero Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia License: GPL URL: http://perso.orange.fr/bonfire/ Source0: http://download.sourceforge.net/bonfire/%{name}-%{version}.tar.bz2 +Patch0: brasero-0.5.1-isofs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext intltool @@ -18,7 +19,7 @@ BuildRequires: nautilus-cd-burner-devel >= 2.16.0 BuildRequires: libbeagle-devel >= 0.1.1 BuildRequires: totem-devel >= 1.2.0 BuildRequires: libburn-devel >= 0.2.1 -BuildRequires: libisofs-devel >= 0.2.1 +BuildRequires: libisofs-devel >= 0.2.4 Requires: dvd+rw-tools Requires: cdrecord @@ -40,6 +41,7 @@ desktop. %prep %setup -q +%patch0 -p1 -b .isofs %build @@ -112,6 +114,9 @@ fi %changelog +* Wed Jan 17 2007 Denis Leroy - 0.5.1-2 +- Added patch to support libisofs.so.4 and libburn.so.6 + * Thu Nov 16 2006 Denis Leroy - 0.5.1-1 - Update to 0.5.1