[packages/jack] - rel 6; build fixed

arekm arekm at pld-linux.org
Sat Dec 12 21:45:42 CET 2015


commit 3aa2bab3be811d40633ed1e90ea55a0777014ed0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Dec 12 21:45:38 2015 +0100

    - rel 6; build fixed

 jack-build.patch | 14 ++++++++++++++
 jack.spec        | 10 ++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/jack.spec b/jack.spec
index 0bfcb3b..811e9f5 100644
--- a/jack.spec
+++ b/jack.spec
@@ -4,11 +4,12 @@ Summary:	Module for accessing CDDB and FreeDB
 Summary(pl.UTF-8):	Moduł do łączenia z bazami CDDB i FreeDB
 Name:		jack
 Version:	3.1.1
-Release:	5
+Release:	6
 License:	GPL
 Group:		Development/Languages/Python
 Source0:	http://www.home.unix-ag.org/arne/jack/%{module}-%{version}.tar.gz
 # Source0-md5:	8ec8971380ba009249d1bb3d1b3e7344
+Patch0:		%{name}-build.patch
 URL:		http://www.home.unix-ag.org/arne/jack/
 BuildRequires:	ncurses-devel
 BuildRequires:	python-devel >= 2.2
@@ -46,11 +47,12 @@ program do zgrywania płyt Audio CD.
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 
 %build
 CFLAGS="%{rpmcflags}"
 export CFLAGS
-python setup.py build
+%py_build
 
 #py_comp *.py
 #py_ocomp *.py
@@ -60,8 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{py_sitedir}
 install -d $RPM_BUILD_ROOT%{_bindir}
 
-python setup.py install \
-        --root=$RPM_BUILD_ROOT --optimize=2
+%py_install
 
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.py
 install jack $RPM_BUILD_ROOT%{_bindir}
@@ -78,3 +79,4 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python-%{module}-cursesmodule
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/jack_cursesmodule.so
+%{py_sitedir}/jack-*.egg-info
diff --git a/jack-build.patch b/jack-build.patch
new file mode 100644
index 0000000..40189e0
--- /dev/null
+++ b/jack-build.patch
@@ -0,0 +1,14 @@
+--- jack-3.1.1/jack_functions.py~	2004-12-12 05:54:36.000000000 +0100
++++ jack-3.1.1/jack_functions.py	2015-12-12 21:43:27.274762217 +0100
+@@ -219,9 +219,9 @@ def blockstomsf(blocks):
+     ff = blocks % CDDA_BLOCKS_PER_SECOND
+     return mm, ss, ff, blocks
+ 
+-def starts_with(str, with):
++def starts_with(str, swith):
+     "checks whether str starts with with"
+-    return str[0:len(with)] == with
++    return str[0:len(swith)] == swith
+ 
+ ## #XXX the following will be used if all references to it have been updated.
+ ## meanwhile the wrapper below is used.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jack.git/commitdiff/3aa2bab3be811d40633ed1e90ea55a0777014ed0



More information about the pld-cvs-commit mailing list