packages: solfege/solfege.spec, solfege/solfege-paths.patch (NEW) - use @li...

[jajcus]

Author: jajcus                       Date: Sat Nov 28 12:22:11 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use @libdir@ and @datadir@ instead of hardcoded 'lib' and 'share' in run-solfege.py.in – fixes startup on x86_64

---- Files affected:
packages/solfege:
   solfege.spec (1.44 -> 1.45) , solfege-paths.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/solfege/solfege.spec
diff -u packages/solfege/solfege.spec:1.44 packages/solfege/solfege.spec:1.45
--- packages/solfege/solfege.spec:1.44	Sat Nov 28 11:39:02 2009
+++ packages/solfege/solfege.spec	Sat Nov 28 13:22:06 2009
@@ -11,6 +11,7 @@
 # Source0-md5:	487c9df5caae642f1f0758758717e7a8
 Patch0:		%{name}-fix.patch
 Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-paths.patch
 URL:		http://solfege.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -72,6 +73,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -148,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2009/11/28 12:22:06  jajcus
+- use @libdir@ and @datadir@ instead of hardcoded 'lib' and 'share' in run-solfege.py.in – fixes startup on x86_64
+
 Revision 1.44  2009/11/28 10:39:02  jajcus
 - Version: 3.14.9
 - _solfege_c_midi.so module loading fixed

================================================================
Index: packages/solfege/solfege-paths.patch
diff -u /dev/null packages/solfege/solfege-paths.patch:1.1
--- /dev/null	Sat Nov 28 13:22:11 2009
+++ packages/solfege/solfege-paths.patch	Sat Nov 28 13:22:05 2009
@@ -0,0 +1,14 @@
+diff -dur solfege-3.14.9.orig/run-solfege.py.in solfege-3.14.9/run-solfege.py.in
+--- solfege-3.14.9.orig/run-solfege.py.in	2009-10-09 19:22:06.000000000 +0000
++++ solfege-3.14.9/run-solfege.py.in	2009-11-28 11:58:54.000000000 +0000
+@@ -29,8 +29,8 @@
+     # variables. Example dir: Gehör
+     prefix = prefix.decode(sys.getfilesystemencoding())
+ os.chdir(os.path.join(prefix, "share", "solfege"))
+-sys.path.insert(1, os.path.join(prefix, "lib", "solfege"))
+-sys.path.insert(1, os.path.join(prefix, "share", "solfege"))
++sys.path.insert(1, os.path.join("@libdir@", "solfege"))
++sys.path.insert(1, os.path.join("@datadir@", "solfege"))
+ 
+ import src
+ import src.cfg
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/solfege/solfege.spec?r1=1.44&r2=1.45&f=u