Hello community,
here is the log from the commit of package csound
checked in at Tue Jan 23 01:13:24 CET 2007.
--------
--- csound/csound.changes 2006-03-27 18:55:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/csound/csound.changes 2007-01-22 13:11:44.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 22 13:11:02 CET 2007 - tiwai@suse.de
+
+- major update to version 5.04
+ (not built with fltk due to lack of threading support)
+
+-------------------------------------------------------------------
Old:
----
Csound-4.24.1.tar.bz2
csound-alsa-fix.dif
csound.dif
csound-printf-fix.dif
csound-tmpnam-fix.dif
New:
----
Csound5.04-src.tar.bz2
csound-alsa-fix.diff
csound-tmpnam-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ csound.spec ++++++
--- /var/tmp/diff_new_pack.o25031/_old 2007-01-23 01:13:09.000000000 +0100
+++ /var/tmp/diff_new_pack.o25031/_new 2007-01-23 01:13:09.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package csound (Version 4.24.1)
+# spec file for package csound (Version 5.04)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,19 +11,23 @@
# norootforbuild
Name: csound
-BuildRequires: alsa-devel fltk-devel gcc-c++ tk-devel xorg-x11-devel
+%define support_fltk 0
+BuildRequires: alsa-devel fluidsynth-devel gcc-c++ jack-devel liblo-devel libsndfile-devel portaudio-devel python-devel scons swig
+%if %support_fltk
+BuildRequires: fltk-devel libjpeg-devel libpng-devel xorg-x11-devel
+%endif
Summary: Computer Sound Synthesis and Composition Program
-Version: 4.24.1
-Release: 228
-License: LGPL
+Version: 5.04
+Release: 1
+License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Productivity/Multimedia/Sound/Utilities
-Source: Csound-%{version}.tar.bz2
+Source: Csound%{version}-src.tar.bz2
Source1: README.SuSE
-Patch: csound.dif
-Patch1: csound-tmpnam-fix.dif
-Patch2: csound-alsa-fix.dif
-Patch3: csound-printf-fix.dif
+Patch: csound-alsa-fix.diff
+Patch1: csound-tmpnam-fix.diff
URL: http://www.csounds.com
+Autoreq: on
+Autoprov: off
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -35,28 +39,36 @@
%prep
-%setup -n Csound-%{version}
-cp %{SOURCE1} .
+%setup -n csound5
%patch
%patch1
-%patch2
-%patch3
+cp %{SOURCE1} .
+# fix encoding
+iconv -f latin1 -t utf8 readme-csound5.txt > readme-csound5.txt.utf8
+mv readme-csound5.txt.utf8 readme-csound5.txt
%build
-make C_FLAGS="$RPM_OPT_FLAGS" LIBDIR='$(INSTDIR)/'%_lib PLGNDIR='$(LIBDIR)/Csound'
+%if %_lib == "lib64"
+args="Word64=1"
+%else
+args=""
+%endif
+scons PREFIX=%{_prefix} $args \
+ customCCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+ customCXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%install
-[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
-make install INSTDIR=$RPM_BUILD_ROOT%{_prefix} LIBDIR='$(INSTDIR)/'%_lib PLGNDIR='$(LIBDIR)/Csound'
-# strip setuid bit for security reason
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/*
-# rename sndinfo to csndinfo
+%if %_lib == "lib64"
+args="--word64"
+%else
+args=""
+%endif
+./install.py --prefix=%{_prefix} --instdir="$RPM_BUILD_ROOT" $args
+rm -f $RPM_BUILD_ROOT%{_prefix}/csound5-*.md5sums
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/csound
+# rename conflicting binary names
mv $RPM_BUILD_ROOT%{_bindir}/sndinfo $RPM_BUILD_ROOT%{_bindir}/csndinfo
-# rename extract to csound-extract
mv $RPM_BUILD_ROOT%{_bindir}/extract $RPM_BUILD_ROOT%{_bindir}/csound-extract
-# clean up unused directories
-rmdir $RPM_BUILD_ROOT/usr/share
-rmdir $RPM_BUILD_ROOT/usr/man
%clean
[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
@@ -69,13 +81,17 @@
%files
%defattr(-,root,root)
+%doc COPYING ChangeLog INSTALL readme-csound5.txt README.SuSE
%{_bindir}/*
%{_includedir}/*
%{_libdir}/lib*
-%{_libdir}/Csound
-%doc doc
+%{_libdir}/csound
+%{_datadir}/csound
%changelog -n csound
+* Mon Jan 22 2007 - tiwai@suse.de
+- major update to version 5.04
+ (not built with fltk due to lack of threading support)
* Mon Mar 27 2006 - pth@suse.de
- Add missing parameter in printf call (bug #129676).
* Wed Jan 25 2006 - mls@suse.de
++++++ csound-alsa-fix.diff ++++++
--- InOut/rtalsa.c-dist 2007-01-22 11:31:00.000000000 +0100
+++ InOut/rtalsa.c 2007-01-22 11:31:28.000000000 +0100
@@ -27,6 +27,9 @@
#ifndef _POSIX_SOURCE
#define _POSIX_SOURCE 1
#endif
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 1
+#endif
#ifndef _BSD_SOURCE
#define _BSD_SOURCE 1
#endif
++++++ csound-tmpnam-fix.diff ++++++
--- Top/one_file.c-dist 2006-10-13 12:31:47.000000000 +0200
+++ Top/one_file.c 2007-01-22 12:06:54.000000000 +0100
@@ -24,6 +24,7 @@
#include "csoundCore.h"
#include