[soundconverter] Ignore bad audio profiles (#744596) and multiple ones with no description. Remove %defattr line.
Michael Schwendt
mschwendt at fedoraproject.org
Sun Oct 9 18:18:27 UTC 2011
commit d659cbd62ccd6eda50d0a7192e8b95d675ad93ac
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Sun Oct 9 20:18:20 2011 +0200
Ignore bad audio profiles (#744596) and multiple ones with no description.
Remove %defattr line.
soundconverter-1.5.4-gst-profile-bad.patch | 16 ++++++++++++++++
soundconverter.spec | 10 ++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/soundconverter-1.5.4-gst-profile-bad.patch b/soundconverter-1.5.4-gst-profile-bad.patch
new file mode 100644
index 0000000..69f4472
--- /dev/null
+++ b/soundconverter-1.5.4-gst-profile-bad.patch
@@ -0,0 +1,16 @@
+diff -Nur soundconverter-1.5.4-orig/src/soundconverter.py soundconverter-1.5.4/src/soundconverter.py
+--- soundconverter-1.5.4-orig/src/soundconverter.py 2011-01-06 21:47:14.000000000 +0100
++++ soundconverter-1.5.4/src/soundconverter.py 2011-10-09 20:14:16.621084082 +0200
+@@ -452,6 +452,12 @@
+ description = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/name")
+ extension = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/extension")
+ pipeline = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/pipeline")
++ if not description:
++ description = "-"
++ if (not extension) and (not pipeline):
++ continue
++ if audio_profiles_dict.has_key(description):
++ continue
+ profile = description, extension, pipeline
+ audio_profiles_list.append(profile)
+ audio_profiles_dict[description] = profile
diff --git a/soundconverter.spec b/soundconverter.spec
index 6ab7fe4..c9240e7 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -1,6 +1,6 @@
Name: soundconverter
Version: 1.5.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Simple sound converter application for GNOME
Group: Applications/Multimedia
@@ -28,6 +28,8 @@ Patch2: soundconverter-1.5.4-markup_escape_text.patch
Patch3: soundconverter-1.5.4-clearlist.patch
# disable FLAC to Ogg Vorbis due to damaged files, GStreamer bz 651615
Patch4: soundconverter-1.5.4-flacogg.patch
+# Fedora bz 744596
+Patch5: soundconverter-1.5.4-gst-profile-bad.patch
# enforce availability of this and its requirement "desktop-notification-daemon"
Requires: notify-python
@@ -62,6 +64,7 @@ writes anything the GStreamer library can.
%patch2 -p1 -b .bz718334
%patch3 -p1 -b .really-clearlist
%patch4 -p1 -b .flacoggdisable
+%patch5 -p1 -b .bz744596
%build
@@ -99,7 +102,6 @@ update-desktop-database &> /dev/null ||:
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_mandir}/man1/%{name}*
%{_bindir}/%{name}
@@ -110,6 +112,10 @@ update-desktop-database &> /dev/null ||:
%changelog
+* Sun Oct 9 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.4-10
+- Ignore bad audio profiles (#744596) and multiple ones with no description.
+- Remove %%defattr line.
+
* Fri Aug 19 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.4-9
- Enhance the previous patch, and consider the case when preferences
are changed after creating a list of input files. Also remove rejected
More information about the scm-commits
mailing list