[soundconverter] Merge upstream pull request: Replacing messy characters replaced also "/".
Michael Schwendt
mschwendt at fedoraproject.org
Wed Dec 25 13:39:38 UTC 2013
commit 1b65d4294e4c64040ade0cc49619760c694f08b3
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Wed Dec 25 14:39:26 2013 +0100
Merge upstream pull request: Replacing messy characters replaced also "/".
soundconverter-replaced-slash.patch | 39 +++++++++++++++++++++++++++++++++++
soundconverter.spec | 9 +++++++-
2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/soundconverter-replaced-slash.patch b/soundconverter-replaced-slash.patch
new file mode 100644
index 0000000..fcc3f76
--- /dev/null
+++ b/soundconverter-replaced-slash.patch
@@ -0,0 +1,39 @@
+From 72e8fb4db7d38a1088eb15666e91155fe6832aff Mon Sep 17 00:00:00 2001
+From: Pawel Ulita <ulitapawel at gmail.com>
+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 @@
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+- <property name="tooltip_text" translatable="yes">Replace /, \, ?, %, *, :, |, ', ", <, > and � with _</property>
++ <property name="tooltip_text" translatable="yes">Replace \, ?, %, *, :, |, ', ", <, > and � with _</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+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 18253ff..5e66533 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -2,7 +2,7 @@
Name: soundconverter
Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple sound converter application for GNOME
Group: Applications/Multimedia
@@ -10,6 +10,9 @@ 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
+
BuildArch: noarch
BuildRequires: python2-devel
@@ -53,6 +56,7 @@ writes anything the GStreamer library can.
%prep
%setup -q -n %{name}-%{tar_ver}
+%patch0 -p1 -b .replaced-slash
%build
@@ -108,6 +112,9 @@ fi
%changelog
+* Wed Dec 25 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.2-2
+- Merge upstream pull request: Replacing messy characters replaced also "/".
+
* Tue Nov 26 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.2-1
- Update to 2.1.2.
More information about the scm-commits
mailing list