packages: tcl-snack/tcl-snack.spec, tcl-snack/glibc2.10.patch (NEW) - add g...

[glen]

Author: glen                         Date: Thu Feb 25 22:29:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add glibc2.10.patch from debian

---- Files affected:
packages/tcl-snack:
   tcl-snack.spec (1.1 -> 1.2) , glibc2.10.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/tcl-snack/tcl-snack.spec
diff -u packages/tcl-snack/tcl-snack.spec:1.1 packages/tcl-snack/tcl-snack.spec:1.2
--- packages/tcl-snack/tcl-snack.spec:1.1	Thu Feb 25 23:13:49 2010
+++ packages/tcl-snack/tcl-snack.spec	Thu Feb 25 23:29:29 2010
@@ -12,6 +12,7 @@
 Patch1:		snack-extracflags.patch
 Patch2:		snack-shared-stubs.patch
 Patch3:		snack-newALSA.patch
+Patch4:		glibc2.10.patch
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libvorbis-devel
@@ -61,13 +62,15 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+
 chmod -x generic/*.c generic/*.h unix/*.c COPYING README demos/python/*
 iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
 mv README{.utf8,}
 sed -i -e 's|\r||g' demos/python/*.txt
 
 %build
-cd unix/
+cd unix
 %configure \
 	--disable-static \
 	--with-tcl=%{_libdir} \
@@ -76,19 +79,23 @@
 	--with-ogg-lib=%{_libdir} \
 	--enable-alsa \
 
-%{__make} EXTRACFLAGS="%{optflags}"
+%{__make} EXTRACFLAGS="%{rpmcflags}"
+
 cd ../python
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd unix
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C unix install \
+	DESTDIR=$RPM_BUILD_ROOT
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-cd -
 
 cd python
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install \
+	--root $RPM_BUILD_ROOT \
+	--skip-build
+
 install -d $RPM_BUILD_ROOT%{tcl_sitearch}
 mv $RPM_BUILD_ROOT%{_libdir}/%{realname}2.2 $RPM_BUILD_ROOT%{tcl_sitearch}/%{realname}2.2
 chmod -x $RPM_BUILD_ROOT%{tcl_sitearch}/%{realname}2.2/snack.tcl
@@ -127,6 +134,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/02/25 22:29:29  glen
+- add glibc2.10.patch from debian
+
 Revision 1.1  2010/02/25 22:13:49  glen
 - new, based on fc
-

================================================================
Index: packages/tcl-snack/glibc2.10.patch
diff -u /dev/null packages/tcl-snack/glibc2.10.patch:1.1
--- /dev/null	Thu Feb 25 23:29:34 2010
+++ packages/tcl-snack/glibc2.10.patch	Thu Feb 25 23:29:29 2010
@@ -0,0 +1,22 @@
+Patch by Ilya Barygin <barygin at gmail.com> moves include of math.h
+upper to make snack build with glibc 2.10 (closes: #548641).
+
+--- snack-2.2.10-dfsg1.orig/generic/jkFormatMP3.c
++++ snack-2.2.10-dfsg1/generic/jkFormatMP3.c
+@@ -29,6 +29,7 @@
+ #include "snack.h"
+ #include "jkFormatMP3.h"
+ #include <string.h>
++#include <math.h>
+ #define FRAS2(is,a) ((is) > 0 ? t_43[(is)]*(a):-t_43[-(is)]*(a))
+ #define MAXFRAMESIZE 2106  /* frame size starting at header */
+ #define roundf(x) (floor((x)+(float )0.5f))
+@@ -1309,8 +1310,6 @@
+   return len;
+ }
+ 
+-#include <math.h>
+-
+ #define PI12      0.261799387f
+ #define PI36      0.087266462f
+ #define COSPI3    0.500000000f
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tcl-snack/tcl-snack.spec?r1=1.1&r2=1.2&f=u