[solfege] Add patch to fix startup issue on F17+ (BZ 832764)
Christian Krause
chkr at fedoraproject.org
Sun Sep 2 23:47:18 UTC 2012
commit be50539dd6438e82831db4723c2479521ba88b30
Author: Christian Krause <chkr at fedoraproject.org>
Date: Mon Sep 3 01:46:57 2012 +0200
Add patch to fix startup issue on F17+ (BZ 832764)
solfege-3.20.6-prefix.patch | 12 ++++++++++++
solfege.spec | 9 ++++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/solfege-3.20.6-prefix.patch b/solfege-3.20.6-prefix.patch
new file mode 100644
index 0000000..585a444
--- /dev/null
+++ b/solfege-3.20.6-prefix.patch
@@ -0,0 +1,12 @@
+diff -uNr solfege-3.20.6.old/run-solfege.py.in solfege-3.20.6/run-solfege.py.in
+--- solfege-3.20.6.old/run-solfege.py.in 2012-06-13 20:45:14.000000000 +0200
++++ solfege-3.20.6/run-solfege.py.in 2012-09-03 01:34:43.308277957 +0200
+@@ -27,7 +27,7 @@
+ import traceback
+ import textwrap
+
+-prefix = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))[0]
++prefix = os.path.split(os.path.dirname(os.path.realpath(sys.argv[0])))[0]
+ if sys.platform == 'win32':
+ s = os.path.normpath(prefix)
+ os.environ['PATH']=r"%s;%s\bin;%s\lib" % (s, s, s)
diff --git a/solfege.spec b/solfege.spec
index c914448..b5716e3 100644
--- a/solfege.spec
+++ b/solfege.spec
@@ -1,12 +1,15 @@
Name: solfege
Version: 3.20.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Music education software
Group: Applications/Multimedia
License: GPLv3
URL: http://www.solfege.org/
Source0: http://downloads.sourceforge.net/solfege/%{name}-%{version}.tar.gz
+# Fix startup issue on F17+ (BZ 832764):
+# Correctly determine the PREFIX even if solfege is executed as /bin/solfege
+Patch0: solfege-3.20.6-prefix.patch
BuildRequires: python2-devel
BuildRequires: texinfo, swig, gettext, docbook-style-xsl
@@ -23,6 +26,7 @@ interval, scale and chord skills. Solfege - Smarten your ears!
%prep
%setup -q
+%patch0 -p1 -b .prefix
#preserve timestamps
%{__sed} -i.stamp -e 's|shutil\.copy|shutil.copy2|' tools/pcopy.py
@@ -66,6 +70,9 @@ desktop-file-install --vendor fedora --delete-original \
%{_mandir}/man?/*
%changelog
+* Sun Sep 02 2012 Christian Krause <chkr at fedoraproject.org> - 3.20.6-2
+- Add patch to fix startup issue on F17+ (BZ 832764)
+
* Sat Jul 21 2012 Christian Krause <chkr at fedoraproject.org> - 3.20.6-1
- Update to new upstream release (BZ 834200)
More information about the scm-commits
mailing list