[sound-juicer] Update to 3.3.90 version
Christophe Fergeau
teuf at fedoraproject.org
Thu Mar 15 13:31:23 UTC 2012
commit a58b458741b0ccb7962abdbe6f750f8b7a6717c4
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Thu Mar 15 13:34:50 2012 +0100
Update to 3.3.90 version
0001-Remove-dbus-use-from-mb-test.c.patch | 58 ++++++++++++++++
gtk-build.patch | 12 ---
playpause.patch | 104 -----------------------------
sound-juicer-2.32.0-drawable.patch | 27 --------
sound-juicer-2.32.0-profiles.patch | 55 ---------------
sound-juicer-mb-crasher.patch | 23 ------
sound-juicer.spec | 43 ++++--------
sources | 2 +-
8 files changed, 74 insertions(+), 250 deletions(-)
---
diff --git a/0001-Remove-dbus-use-from-mb-test.c.patch b/0001-Remove-dbus-use-from-mb-test.c.patch
new file mode 100644
index 0000000..0e17501
--- /dev/null
+++ b/0001-Remove-dbus-use-from-mb-test.c.patch
@@ -0,0 +1,58 @@
+From 0faf8a42614cc808982ed55f1ff1149b13dc9489 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Sun, 22 Jan 2012 12:51:40 +0100
+Subject: [PATCH] Remove dbus use from mb-test.c
+
+265a47a removed dbus use from sound-juicer. In particular,
+DBUS_CFLAGS and DBUS_LIBS are no longer defined, so mb-test fails
+to link because it calls one dbus init function. This call is
+no longer needed since s-j stopped using dbus.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=670397
+---
+ tests/Makefile.am | 2 --
+ tests/mb-test.c | 3 ---
+ 2 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 3bb530b..dbb1c13 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -15,13 +15,11 @@ mb_test_CFLAGS = \
+ $(GSTREAMER_CFLAGS) \
+ $(BURN_CFLAGS) \
+ $(UI_CFLAGS) \
+- $(DBUS_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+ mb_test_LDADD = \
+ $(BURN_LIBS) \
+ $(UI_LIBS) \
+- $(DBUS_LIBS) \
+ $(top_builddir)/libjuicer/libjuicer.la
+
+ mb_test_LDFLAGS = \
+diff --git a/tests/mb-test.c b/tests/mb-test.c
+index 127d33c..1e63049 100644
+--- a/tests/mb-test.c
++++ b/tests/mb-test.c
+@@ -2,7 +2,6 @@
+ #include <brasero-medium-monitor.h>
+ #include <glib.h>
+ #include <gconf/gconf-client.h>
+-#include <dbus/dbus.h>
+ #include <stdlib.h>
+ #include "sj-structures.h"
+ #include "sj-metadata.h"
+@@ -98,8 +97,6 @@ int main (int argc, char** argv)
+ GError *error = NULL;
+ BraseroMediumMonitor *monitor;
+
+- dbus_threads_init_default ();
+-
+ g_type_init ();
+ g_thread_init (NULL);
+
+--
+1.7.7.6
+
diff --git a/sound-juicer.spec b/sound-juicer.spec
index 8199b6c..e5fcdfe 100644
--- a/sound-juicer.spec
+++ b/sound-juicer.spec
@@ -1,27 +1,20 @@
-%define glib_version 2.6.0
-%define gtk_version 2.8.0
-%define gstreamer_version 0.10.3
+%define glib_version 2.18.0
+%define gstreamer_version 0.10.32
%define gconf_version 2.14
-%define gnome_media_version 2.11.91
%define scrollkeeper_version 0.3.5
Name: sound-juicer
Summary: Clean and lean CD ripper
-Version: 2.32.0
-Release: 8%{?dist}
+Version: 3.3.90
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
#VCS: git:git://git.gnome.org/sound-juicer
-Source: http://download.gnome.org/sources/sound-juicer/2.32/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/sound-juicer/3.3/%{name}-%{version}.tar.xz
+Patch0: 0001-Remove-dbus-use-from-mb-test.c.patch
URL: http://www.burtonini.com/blog/computers/sound-juicer
Requires: cdparanoia
-# https://bugzilla.gnome.org/show_bug.cgi?id=630868
-Patch0: gtk-build.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=631887 (rediffed)
-Patch1: sound-juicer-2.32.0-drawable.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=634729
-Patch2: sound-juicer-2.32.0-profiles.patch
Requires(pre): GConf2 >= %{gconf_version}
Requires(post): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
@@ -30,8 +23,8 @@ Requires(postun): desktop-file-utils
Requires(post): /usr/bin/gtk-update-icon-cache
Requires(postun): /usr/bin/gtk-update-icon-cache
-BuildRequires: gnome-media-devel >= %{gnome_media_version}
-BuildRequires: libmusicbrainz3-devel
+BuildRequires: libmusicbrainz4-devel
+BuildRequires: libdiscid-devel
BuildRequires: glib2-devel >= %{glib_version}
BuildRequires: gtk3-devel
BuildRequires: gstreamer-devel >= %{gstreamer_version}
@@ -44,8 +37,8 @@ BuildRequires: scrollkeeper >= %{scrollkeeper_version}
BuildRequires: gcc-c++
BuildRequires: gettext intltool
BuildRequires: libcanberra-devel
-BuildRequires: gnome-common
-BuildRequires: automake autoconf libtool
+#BuildRequires: gnome-common
+#BuildRequires: automake autoconf libtool
BuildRequires: desktop-file-utils
BuildRequires: dbus-glib-devel
@@ -56,18 +49,10 @@ GStreamer-based CD ripping tool. Saves audio CDs to Ogg/vorbis.
%prep
%setup -q
-%patch0 -p1 -b .gtk-build
-%patch1 -p1 -b .drawable
-%patch2 -p1 -b .profiles
+# patch from sound-juicer upstream git repository
+%patch0 -p1
%build
-# work around a gstreamer problem where it
-# doesn't find plugins the first time around
-DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all
-
-# needed for profiles.patch, can be removed when that's upstreamed
-autoconf
-
%configure --disable-scrollkeeper --with-gtk=3.0
# drop unneeded direct library deps with --as-needed
@@ -134,10 +119,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_datadir}/sound-juicer
%{_datadir}/applications/sound-juicer.desktop
%{_datadir}/icons/hicolor/*/apps/sound-juicer.png
-%{_datadir}/icons/hicolor/*/apps/sound-juicer.svg
%{_mandir}/man1/*
%changelog
+* Thu Mar 15 2012 Christophe Fergeau <cfergeau at redhat.com> 3.3.90-1
+- Update to 3.3.90
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 85b4fa2..81e3063 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8261bd1f450d7056d15828ed2a69ef65 sound-juicer-2.32.0.tar.bz2
+eb2ad7f60d106ea1af84e3abb0d95e90 sound-juicer-3.3.90.tar.xz
More information about the scm-commits
mailing list