diff --git a/soundconverter-gstreamer-on-error.patch b/soundconverter-gstreamer-on-error.patch deleted file mode 100644 index d7c65a3..0000000 --- a/soundconverter-gstreamer-on-error.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nurb --strip-trailing-cr soundconverter-2.1.2-orig/soundconverter/gstreamer.py soundconverter-2.1.2/soundconverter/gstreamer.py ---- soundconverter-2.1.2-orig/soundconverter/gstreamer.py 2013-11-17 15:40:11.000000000 +0100 -+++ soundconverter-2.1.2/soundconverter/gstreamer.py 2014-01-03 22:21:49.553484248 +0100 -@@ -597,6 +597,7 @@ - def on_error(self, err): - #pass - -+ self.error = err - show_error('%s' % _('GStreamer Error:'), '%s\n(%s)' % (err, - self.sound_file.filename_for_display)) - diff --git a/soundconverter-replaced-slash.patch b/soundconverter-replaced-slash.patch deleted file mode 100644 index fcc3f76..0000000 --- a/soundconverter-replaced-slash.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 72e8fb4db7d38a1088eb15666e91155fe6832aff Mon Sep 17 00:00:00 2001 -From: Pawel Ulita -Date: Tue, 24 Dec 2013 23:50:44 +0100 -Subject: [PATCH] Replacing messy characters replaced also "/". - ---- - data/soundconverter.glade | 2 +- - soundconverter/namegenerator.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/soundconverter.glade b/data/soundconverter.glade -index 28c8946..ed22e91 100644 ---- a/data/soundconverter.glade -+++ b/data/soundconverter.glade -@@ -1047,7 +1047,7 @@ - True - True - False -- Replace /, \, ?, %, *, :, |, ', ", <, > and � with _ -+ Replace \, ?, %, *, :, |, ', ", <, > and � with _ - False - True - True -diff --git a/soundconverter/namegenerator.py b/soundconverter/namegenerator.py -index c5f6b6a..ec53d18 100644 ---- a/soundconverter/namegenerator.py -+++ b/soundconverter/namegenerator.py -@@ -30,7 +30,7 @@ class TargetNameGenerator: - - """Generator for creating the target name from an input name.""" - -- bad_chars = u'/\\?%*:|"<>\ufffd' -+ bad_chars = u'\\?%*:|"<>\ufffd' - - def __init__(self): - self.folder = None --- -1.8.5.1 - diff --git a/soundconverter.spec b/soundconverter.spec index 4af8d31..9241f52 100644 --- a/soundconverter.spec +++ b/soundconverter.spec @@ -1,8 +1,8 @@ -%global tar_ver 2.1.2 +%global tar_ver 2.1.3 Name: soundconverter -Version: 2.1.2 -Release: 3%{?dist} +Version: 2.1.3 +Release: 1%{?dist} Summary: Simple sound converter application for GNOME Group: Applications/Multimedia @@ -10,11 +10,6 @@ License: GPLv3 URL: http://soundconverter.org Source0: http://launchpad.net/soundconverter/trunk/%{tar_ver}/+download/soundconverter-%{tar_ver}.tar.xz -# https://github.com/kassoulet/soundconverter/pull/7 -Patch0: soundconverter-replaced-slash.patch -# https://github.com/kassoulet/soundconverter/pull/8 -Patch1: soundconverter-gstreamer-on-error.patch - BuildArch: noarch BuildRequires: python2-devel @@ -58,8 +53,6 @@ writes anything the GStreamer library can. %prep %setup -q -n %{name}-%{tar_ver} -%patch0 -p1 -b .replaced-slash -%patch1 -p1 -b .gst-on-error %build @@ -115,6 +108,9 @@ fi %changelog +* Thu May 1 2014 Michael Schwendt - 2.1.3-1 +- Update to 2.1.3 (a few more bug-fixes). + * Fri Jan 3 2014 Michael Schwendt - 2.1.2-3 - Merge upstream pull request: Pass on error in another location.