Attachment 144433 Details for Bug 220856 – csound spec file diff

csound spec file diff

csound.diff (text/x-patch), 5.42 KB, created by Paul F. Johnson on 2006-12-28 01:47:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul F. Johnson

Created: 2006-12-28 01:47:34 UTC

Size: 5.42 KB

patch

obsolete

>--- csound.spec	2006-11-09 01:28:00.000000000 +0000
>+++ csound-pfj.spec	2006-12-28 01:34:44.000000000 +0000
>@@ -7,18 +7,20 @@
> %define install64bit %{nil}
> %endif
> 
>+%define python_includedir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_inc()')
>+%define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
> 
> Summary:       Csound - sound synthesis language and library
> Name:          csound
>-Version:       5.03.0
>-Release:       9%{?dist}
>+Version:       5.04
>+Release:       1%{?dist}
> URL:           http://csound.sourceforge.net/
> License:       LGPL
> Group:         Applications/Multimedia
> 
> BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires: swig scons libsndfile-devel libpng-devel libjpeg-devel
>-BuildRequires: python python-devel
>+BuildRequires: python python-devel boost-devel
> BuildRequires: alsa-lib-devel fluidsynth-devel
> BuildRequires: jack-audio-connection-kit-devel liblo-devel dssi-devel 
> BuildRequires: fltk-devel fltk-fluid
>@@ -28,19 +30,19 @@
> BuildRequires: tk-devel tcl-devel
> BuildRequires: tetex tetex-latex libxslt
> 
>-Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061108.tar.bz2
>-
>-# NOTE:
>-# Manual sources aren't distributed, but may be extracted from CVS via...
>-# cvs -d :pserver:anonymous@csound.cvs.sourceforge.net:/cvsroot/csound login
>-# cvs -z9 -d :pserver:anonymous@csound.cvs.sourceforge.net:/cvsroot/csound checkout -P -r csound-5_03_0 manual
>-Source1: Csound5.03_manual.tgz
>+Source0: http://mesh.dl.sourceforge.net/sourceforge/csound/Csound%{version}-src.tar.gz
>+Source1: Csound5.04_manual_html.zip
> 
> Patch0: csound-5.03.0-enable-fluidsynth.patch
> Patch1: csound-5.03.0-gstabs-disable-option.patch
> Patch2: csound-5.03.0-no-usr-local.patch
> Patch3: csound-5.03.0-disable-atsa.patch
> Patch4: csound-5.03.0-default-opcodedir.patch
>+Patch5: csound-rtalsa.patch
>+
>+Requires(postun): %{_sbindir}/alternatives
>+Requires(preun): %{_sbindir}/alternatives
>+Requires(post): %{_sbindir}/alternatives
> 
> %description
> Csound is a sound and music synthesis system, providing facilities for
>@@ -80,6 +82,7 @@
> Requires(post):   /sbin/ldconfig
> Requires(postun): /sbin/ldconfig
> 
>+
> %description java
> Contains Java language bindings for developing and running Java
> applications that use Csound.
>@@ -165,6 +168,7 @@
> %package manual
> Summary: Csound manual
> Group: Documentation
>+Requires: %{name} = %{version}-%{release}
> 
> %description manual
> Canonical Reference Manual for Csound.
>@@ -172,20 +176,22 @@
> %package tutorial
> Summary: Csound tutorial
> Group: Documentation
>+Requires: %{name} = %{version}-%{release}
> 
> %description tutorial
> Tutorial documentation and sample files for Csound.
> 
> 
> %prep
>-%setup -q -n Csound5.03.0
>+%setup -q -n csound5
> %patch0 -p1 -b .enable-fluidsynth
> %patch1 -p1 -b .gstabs-disable-option
> %patch2 -p1 -b .no-usr-local
> %patch3 -p1 -b .disable-atsa
> %patch4 -p1 -b .default-opcodedir
>+%patch5 -p1 -b .rtalsa
> 
>-tar xf %{SOURCE1}
>+unzip -q %{SOURCE1}
> 
> %build
> 
>@@ -203,7 +209,7 @@
>       usePortMIDI=0 \
>       useOSC=1 \
>       useJack=1 \
>-      useFLTK=1 \
>+      useFLTK=0 \
>       useFluidsynth=1 \
>       generatePdf=0 \
>       buildCsound5GUI=1 \
>@@ -241,7 +247,7 @@
> # This file is zero-lenth for some reason
> %{__rm} -f manual/examples/ifthen.csd
> 
>-%{__mv} %{buildroot}%{_libdir}/lib_csnd.so %{buildroot}%{_libdir}/python2.4/site-packages/_csnd.so
>+%{__mv} %{buildroot}%{_libdir}/lib_csnd.so %{buildroot}%{python_sitearch}/_csnd.so
> 
> install -dm 755 %{buildroot}%{_javadir}
> (cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .)
>@@ -251,12 +257,31 @@
> 
> %{_bindir}/aot-compile-rpm
> 
>+mv %{buildroot}/%{_bindir}/extract %{buildroot}/%{_bindir}/extract.csound
>+mkdir -p %{buildroot}/%{_sysconfdir}/alternatives
>+
> %clean
> %{__rm} -rf %{buildroot}
> 
>-%post -p /sbin/ldconfig
>+%preun
>+if [ $1 = 0 ] ; then
>+/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
>+%{_sbindir}/alternatives --remove extract %{_bindir}/extract.csound
>+fi
> 
>-%postun -p /sbin/ldconfig
>+%post 
>+/sbin/ldconfig
>+%{_sbindir}/alternatives --install %{_bindir}/extact extract %{_bindir}/extract.csound 90
>+
>+%triggerpostun -- csound < 5.0.3
>+%{_sbindir}/alternatives --auto extract
>+
>+%postun 
>+extract=`readlink /etc/alternatives/extract`
>+if [ "$getdefs" == "%{_bindir}/extract.csound" ]; then
>+   %{_sbindir}/alternatives --set extract %{_bindir}/extract.csound
>+fi
>+/sbin/ldconfig
> 
> %post java
> if [ -x %{_bindir}/rebuild-gcj-db ]; then
>@@ -277,7 +302,7 @@
> %{_bindir}/cvanal
> %{_bindir}/dnoise
> %{_bindir}/envext
>-%{_bindir}/extract
>+%{_bindir}/extract.csound
> %{_bindir}/extractor
> %{_bindir}/het_export
> %{_bindir}/het_import
>@@ -338,7 +363,7 @@
> 
> %files python
> %defattr(-,root,root,0755)
>-%{_libdir}/python2.4/site-packages/*
>+%{python_sitearch}/*
> 
> %files java
> %{_libdir}/lib_jcsound.so
>@@ -402,6 +427,17 @@
> %doc tutorial/*.py
> 
> %changelog
>+* Thu Dec 28 2006 Paul F. Johnson <paul@all-the-johnsons.co.uk> 5.04-10
>+- changed to use python_sitearch
>+- fixed conflict with html-xml-utils
>+- patch for rtalsa problem
>+- bump to newer version
>+- altered URL for download (not a big thing...)
>+- added BR boost-devel
>+- added R for the tutorial and manual
>+- manual now downloadable as a zip file
>+- disabled fltk as there is something bust in the fltk compiler
>+
> * Wed Nov  8 2006 Dan Williams <dcbw@redhat.com> 5.03.0-9
> - CVS snapshot for fixes to the virtual midi keyboard
>

Actions: View

Attachments on bug 220856: 144433 | 144434