diff --git a/.gitignore b/.gitignore index 99c3000..a4f4698 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ faust-0.9.24.tar.gz /faust-0.9.30.tar.gz +/faust-0.9.43.tar.gz diff --git a/faust-osclib-shared.patch b/faust-osclib-shared.patch new file mode 100644 index 0000000..275e967 --- /dev/null +++ b/faust-osclib-shared.patch @@ -0,0 +1,286 @@ +diff -rupN faust-0.9.43.old/architecture/osclib/faust/Makefile faust-0.9.43/architecture/osclib/faust/Makefile +--- faust-0.9.43.old/architecture/osclib/faust/Makefile 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/architecture/osclib/faust/Makefile 2011-11-25 13:54:51.189933652 -0500 +@@ -1,3 +1,4 @@ ++libname := libOSCFaust.so + subprojects := include src src/lib src/msg src/nodes src/osc src/threads + sources = $(wildcard src/*.cpp) $(wildcard src/*/*.cpp) + objects = $(sources:.cpp=.o) +@@ -7,12 +8,13 @@ VPATH = $(subprojects) + CXXFLAGS ?= -O3 -Wall -Wuninitialized + CXXFLAGS += -Wno-parentheses -I../oscpack -I../oscpack/osc $(addprefix -I, $(subprojects)) -DINSTALL_PREFIX='"$(prefix)"' + +-all : libOSCFaust.a ++all : $(libname) + +-libOSCFaust.a : $(objects) +- rm -f $@ +- ar cq $@ $(objects) +- ranlib $@ ++$(libname) : $(objects) ++ rm -f $@* ++ $(CXX) $(CXXFLAGS) -shared $(objects) -Wl,-soname -Wl,$(libname).0 -lpthread -L../oscpack -loscpack -o $(libname).0.0.0 ++ ln -sf $(libname).0.0.0 $(libname).0 ++ ln -sf $(libname).0.0.0 $(libname) + + + depend : +diff -rupN faust-0.9.43.old/architecture/osclib/Makefile faust-0.9.43/architecture/osclib/Makefile +--- faust-0.9.43.old/architecture/osclib/Makefile 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/architecture/osclib/Makefile 2011-11-25 13:50:06.744343321 -0500 +@@ -14,10 +14,10 @@ all : liboscpack.a libOSCFaust.a + + + liboscpack.a : oscpack/liboscpack.a +- cp oscpack/liboscpack.a $@ ++ cp -P oscpack/liboscpack.* . + + libOSCFaust.a : faust/libOSCFaust.a +- cp faust/libOSCFaust.a $@ ++ cp -P faust/libOSCFaust.* . + + + oscpack/liboscpack.a: +diff -rupN faust-0.9.43.old/architecture/osclib/oscpack/Makefile faust-0.9.43/architecture/osclib/oscpack/Makefile +--- faust-0.9.43.old/architecture/osclib/oscpack/Makefile 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/architecture/osclib/oscpack/Makefile 2011-11-25 13:22:13.207534095 -0500 +@@ -1,4 +1,4 @@ +-libname := liboscpack.a ++libname := liboscpack.so + system ?= $(shell uname -s) + + ifeq ($(system), Darwin) +@@ -30,8 +30,9 @@ all: $(libname) + + $(libname): $(objects) + rm -f $@ +- ar cq $@ $(objects) +- ranlib $@ ++ $(CXX) $(CXXFLAGS) -shared $(objects) -Wl,-soname -Wl,$(libname).0 -o $(libname).0.0.0 ++ ln -sf $(libname).0.0.0 $(libname).0 ++ ln -sf $(libname).0.0.0 $(libname) + + depend : + makedepend -fMakefile -w120 -Y -- $(CXXFLAGS) -- $(sources) +diff -rupN faust-0.9.43.old/Makefile faust-0.9.43/Makefile +--- faust-0.9.43.old/Makefile 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/Makefile 2011-11-25 14:05:40.979690040 -0500 +@@ -2,11 +2,15 @@ version := 0.9.43 + + DESTDIR ?= + PREFIX ?= /usr/local ++LIBDIR ?= /usr/local/lib ++INCLUDEDIR ?= /usr/local/include + CROSS=i586-mingw32msvc- + + MAKEFILE := Makefile.unix + + prefix := $(DESTDIR)$(PREFIX) ++libdir := $(DESTDIR)$(LIBDIR) ++includedir := $(DESTDIR)$(INCLUDEDIR) + arch := $(wildcard architecture/*.*) + mfiles := $(wildcard examples/Makefile.*) + vname := faust-$(version)-$(shell date +%y%m%d.%H%M%S) +@@ -52,8 +56,10 @@ doc : + + + install : +- mkdir -p $(prefix)/lib/faust/osclib ++ mkdir -p $(libdir) ++ mkdir -p $(prefix)/share/faust + mkdir -p $(prefix)/bin/ ++ mkdir -p $(includedir) + install compiler/faust $(prefix)/bin/ + install -m 0644 $(arch) $(prefix)/lib/faust/ + rm -rf $(prefix)/lib/faust/VST +@@ -62,8 +68,8 @@ install : + cp -r architecture/iPhone $(prefix)/lib/faust/ + cp -r architecture/audio $(prefix)/lib/faust/ + cp -r architecture/gui $(prefix)/lib/faust/ +- cp architecture/osclib/lib*.a $(prefix)/lib/faust/osclib +- cp architecture/osclib/faust/include/*.h $(prefix)/lib/faust/osclib ++ cp -Pr architecture/osclib/lib*.so* $(libdir) ++ cp -pr architecture/osclib/faust/include/*.h $(includedir) + find $(prefix)/lib/faust/ -name CVS | xargs rm -rf + install -m 0644 $(mfiles) $(prefix)/lib/faust/ + make -C tools/faust2appls install +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2alqt faust-0.9.43/tools/faust2appls/faust2alqt +--- faust-0.9.43.old/tools/faust2appls/faust2alqt 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2alqt 2011-11-25 15:14:05.699689927 -0500 +@@ -41,9 +41,9 @@ for p in $@; do + if [ "$p" = -icc ]; then + ignore=" " + elif [ $p = "-osc" ]; then +- OSCINC="INCLUDEPATH+=/usr/local/lib/faust/osclib" ++ OSCINC="INCLUDEPATH+=/usr/include" + QTDEFS="DEFINES += OSCCTRL" +- OSCLIB="-L/usr/local/lib/faust/osclib -lOSCFaust -loscpack" ++ OSCLIB="-lOSCFaust -loscpack" + elif [ ${p:0:1} = "-" ]; then + OPTIONS="$OPTIONS $p" + elif [[ -e "$p" ]]; then +@@ -83,7 +83,7 @@ for p in $FILES; do + # compile c++ to binary + ( + cd "$TMP" +- qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "$OSCINC" "LIBS+=-lasound $OSCLIB" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" "$QTDEFS" ++ qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust/" "$OSCINC" "LIBS+=-lasound $OSCLIB" "HEADERS+=/usr/share/faust/gui/faustqt.h" "$QTDEFS" + qmake $SPEC + make + ) > /dev/null +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2alsa faust-0.9.43/tools/faust2appls/faust2alsa +--- faust-0.9.43.old/tools/faust2appls/faust2alsa 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2alsa 2011-11-25 15:10:10.990082303 -0500 +@@ -47,7 +47,7 @@ for p in $@; do + if [ "$p" = -icc ]; then + ignore=" " + elif [ $p = "-osc" ]; then +- OSCDEFS="-I/usr/local/lib/faust/osclib -DOSCCTRL -L/usr/local/lib/faust/osclib -lOSCFaust -loscpack" ++ OSCDEFS="-I/usr/include -DOSCCTRL -lOSCFaust -loscpack" + elif [ ${p:0:1} = "-" ]; then + OPTIONS="$OPTIONS $p" + elif [[ -e "$p" ]]; then +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2caqt faust-0.9.43/tools/faust2appls/faust2caqt +--- faust-0.9.43.old/tools/faust2appls/faust2caqt 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2caqt 2011-11-25 15:13:46.636802753 -0500 +@@ -41,9 +41,9 @@ for p in $@; do + elif [ "$p" = -icc ]; then + ignore=" " + elif [ "$p" = "-osc" ]; then +- OSCINC="INCLUDEPATH+=/usr/local/lib/faust/osclib" ++ OSCINC="INCLUDEPATH+=/usr/include" + QTDEFS="DEFINES += OSCCTRL" +- OSCLIB="-L/usr/local/lib/faust/osclib -lOSCFaust -loscpack" ++ OSCLIB="-lOSCFaust -loscpack" + elif [ ${p:0:1} = "-" ]; then + OPTIONS="$OPTIONS $p" + elif [[ -e "$p" ]]; then +@@ -83,7 +83,7 @@ for p in $FILES; do + # compile c++ to binary + ( + cd "$TMP" +- qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "$OSCINC" "LIBS+=-framework CoreAudio -framework AudioUnit -framework CoreServices $OSCLIB" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" "$QTDEFS" ++ qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust/" "$OSCINC" "LIBS+=-framework CoreAudio -framework AudioUnit -framework CoreServices $OSCLIB" "HEADERS+=/usr/share/faust/gui/faustqt.h" "$QTDEFS" + qmake $SPEC + make + ) > /dev/null #2>/dev/null +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2dssi faust-0.9.43/tools/faust2appls/faust2dssi +--- faust-0.9.43.old/tools/faust2appls/faust2dssi 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2dssi 2011-11-25 15:11:38.220563997 -0500 +@@ -39,7 +39,7 @@ for p in $@; do + ignore=" " + elif [ $p = "-osc" ]; then + #option ignored for dssi plugins +- OSCDEFS="-I/usr/local/lib/faust/osclib -DOSCCTRL -L/usr/local/lib/faust/osclib -lOSCFaust -loscpack" ++ OSCDEFS="-I/usr/include -DOSCCTRL -lOSCFaust -loscpack" + elif [ ${p:0:1} = "-" ]; then + OPTIONS="$OPTIONS $p" + elif [[ -e "$p" ]]; then +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2jack faust-0.9.43/tools/faust2appls/faust2jack +--- faust-0.9.43.old/tools/faust2appls/faust2jack 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2jack 2011-11-25 15:08:15.133772250 -0500 +@@ -48,7 +48,7 @@ for p in $@; do + if [ "$p" = -icc ]; then + ignore=" " + elif [ $p = "-osc" ]; then +- OSCDEFS="-I/usr/local/lib/faust/osclib -DOSCCTRL -L/usr/local/lib/faust/osclib -lOSCFaust -loscpack" ++ OSCDEFS="-I/usr/include -DOSCCTRL -lOSCFaust -loscpack" + elif [ ${p:0:1} = "-" ]; then + OPTIONS="$OPTIONS $p" + elif [[ -e "$p" ]]; then +@@ -71,7 +71,7 @@ for f in $FILES; do + + # compile c++ to binary + ( +- $CXX $CXXFLAGS $OMP -I/usr/local/lib/faust "$f.cpp" `pkg-config --cflags --libs jack gtk+-2.0` $OSCDEFS -o "${f%.dsp}" ++ $CXX $CXXFLAGS $OMP -I/usr/include "$f.cpp" `pkg-config --cflags --libs jack gtk+-2.0` $OSCDEFS -o "${f%.dsp}" + ) > /dev/null + rm "$f.cpp" + +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2jackserver faust-0.9.43/tools/faust2appls/faust2jackserver +--- faust-0.9.43.old/tools/faust2appls/faust2jackserver 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2jackserver 2011-11-25 15:12:49.317142282 -0500 +@@ -12,7 +12,7 @@ if [[ $(uname) == Darwin ]]; then + + faust -a jack-qt.cpp $f -o $TMP/${f%.dsp}.cpp + +- cd $TMP; qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "LIBS+=-ljackserver" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" ++ cd $TMP; qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust/" "LIBS+=-ljackserver" "HEADERS+=/usr/share/faust/gui/faustqt.h" + cd $TMP; qmake + echo toto + cd $TMP; xcodebuild -project ${f%.dsp}.xcodeproj +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2jaqt faust-0.9.43/tools/faust2appls/faust2jaqt +--- faust-0.9.43.old/tools/faust2appls/faust2jaqt 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2jaqt 2011-11-25 15:13:26.155924023 -0500 +@@ -41,9 +41,9 @@ for p in $@; do + if [ "$p" = -icc ]; then + ignore=" " + elif [ $p = "-osc" ]; then +- OSCINC="INCLUDEPATH+=/usr/local/lib/faust/osclib" ++ OSCINC="INCLUDEPATH+=/usr/include" + QTDEFS="DEFINES += OSCCTRL" +- OSCLIB="-L/usr/local/lib/faust/osclib -lOSCFaust -loscpack" ++ OSCLIB="-lOSCFaust -loscpack" + elif [ ${p:0:1} = "-" ]; then + OPTIONS="$OPTIONS $p" + elif [[ -e "$p" ]]; then +@@ -83,7 +83,7 @@ for p in $FILES; do + # compile c++ to binary + ( + cd "$TMP" +- qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "$OSCINC" "LIBS+=-ljack $OSCLIB" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" "$QTDEFS" ++ qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust" "$OSCINC" "LIBS+=-ljack $OSCLIB" "HEADERS+=/usr/share/faust/gui/faustqt.h" "$QTDEFS" + qmake $SPEC + make + ) > /dev/null +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2ladspa faust-0.9.43/tools/faust2appls/faust2ladspa +--- faust-0.9.43.old/tools/faust2appls/faust2ladspa 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2ladspa 2011-11-25 15:04:17.608192503 -0500 +@@ -42,7 +42,7 @@ for p in $@; do + ignore=" " + elif [ $p = "-osc" ]; then + #option ignored for plugins +- OSCDEFS="-I/usr/local/lib/faust/osclib -DOSCCTRL -L/usr/local/lib/faust/osclib -lOSCFaust -loscpack" ++ OSCDEFS="-DOSCCTRL -lOSCFaust -loscpack" + elif [ ${p:0:1} = "-" ]; then + OPTIONS="$OPTIONS $p" + elif [[ -e "$p" ]]; then +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2msp faust-0.9.43/tools/faust2appls/faust2msp +--- faust-0.9.43.old/tools/faust2appls/faust2msp 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2msp 2011-11-25 15:09:46.679226931 -0500 +@@ -98,9 +98,9 @@ for p in $FILES; do + ( + cd "$TMP" + install -d "${f%.dsp}$EXT/Contents/MacOS" +- $CC -arch i386 -fpascal-strings -fasm-blocks -g -O3 -I$CUR -I/usr/local/lib/faust -I/usr/local/include/c74support/max-includes -I/usr/local/include/c74support/msp-includes -c "${f%.dsp}.cpp" -o "${f%.dsp}.i386.o" ++ $CC -arch i386 -fpascal-strings -fasm-blocks -g -O3 -I$CUR -I/usr/share/faust -I/usr/local/include/c74support/max-includes -I/usr/local/include/c74support/msp-includes -c "${f%.dsp}.cpp" -o "${f%.dsp}.i386.o" + $CC -framework MaxAPI -framework Carbon -framework MaxAudioAPI -arch i386 -Wl,-Y,1455 -bundle "${f%.dsp}.i386.o" -o "${f%.dsp}.i386~" +- $CC -arch ppc -fpascal-strings -fasm-blocks -g -O3 -I$CUR -I/usr/local/lib/faust -I/usr/local/include/c74support/max-includes -I/usr/local/include/c74support/msp-includes -c "${f%.dsp}.cpp" -o "${f%.dsp}.ppc.o" ++ $CC -arch ppc -fpascal-strings -fasm-blocks -g -O3 -I$CUR -I/usr/share/faust -I/usr/local/include/c74support/max-includes -I/usr/local/include/c74support/msp-includes -c "${f%.dsp}.cpp" -o "${f%.dsp}.ppc.o" + $CC -framework Carbon -framework MaxAPI -framework MaxAudioAPI -arch ppc -Wl,-Y,1455 -bundle "${f%.dsp}.ppc.o" -o "${f%.dsp}.ppc~" + createInfoPList "${f%.dsp}~" "${f%.dsp}$EXT/Contents/Info.plist" + lipo -create "${f%.dsp}.i386~" "${f%.dsp}.ppc~" -output "${f%.dsp}$EXT/Contents/MacOS/${f%.dsp}~" +diff -rupN faust-0.9.43.old/tools/faust2appls/faust2paqt faust-0.9.43/tools/faust2appls/faust2paqt +--- faust-0.9.43.old/tools/faust2appls/faust2paqt 2011-07-21 12:02:24.000000000 -0400 ++++ faust-0.9.43/tools/faust2appls/faust2paqt 2011-11-25 15:12:14.981345868 -0500 +@@ -41,9 +41,9 @@ for p in $@; do + if [ "$p" = -icc ]; then + ignore=" " + elif [ $p = "-osc" ]; then +- OSCINC="INCLUDEPATH+=/usr/local/lib/faust/osclib" ++ OSCINC="INCLUDEPATH+=/usr/include" + QTDEFS="DEFINES += OSCCTRL" +- OSCLIB="-L/usr/local/lib/faust/osclib -lOSCFaust -loscpack" ++ OSCLIB="-lOSCFaust -loscpack" + elif [ ${p:0:1} = "-" ]; then + OPTIONS="$OPTIONS $p" + elif [[ -e "$p" ]]; then +@@ -83,7 +83,7 @@ for p in $FILES; do + # compile c++ to binary + ( + cd "$TMP" +- qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "$OSCINC" "LIBS+=-lportaudio $OSCLIB" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" "$QTDEFS" ++ qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust" "$OSCINC" "LIBS+=-lportaudio $OSCLIB" "HEADERS+=/usr/share/faust/gui/faustqt.h" "$QTDEFS" + qmake $SPEC + make + ) > /dev/null diff --git a/faust.spec b/faust.spec index 4668097..99394d3 100644 --- a/faust.spec +++ b/faust.spec @@ -1,13 +1,14 @@ Name: faust -Version: 0.9.30 -Release: 2%{?dist} +Version: 0.9.43 +Release: 1%{?dist} Summary: Compiled language for real-time audio signal processing -Group: Development/Languages # Examples are BSD # The rest is GPLv2+ License: GPLv2+ and BSD URL: http://faust.grame.fr/ Source0: http://downloads.sourceforge.net/project/faudiostream/%{name}-%{version}.tar.gz +# Build osclib as a shared library +Patch0: faust-osclib-shared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: graphviz @@ -31,7 +32,6 @@ according to its input signals (and maybe some user interface parameters) %package doc Summary: Documentation for %{name} -Group: Documentation License: GPLv2+ BuildArch: noarch Requires: %{name} = %{version}-%{release} @@ -41,12 +41,30 @@ Faust AUdio STreams is a functional programming language for real-time audio signal processing. This package provides documentation files to help with writing programs with faust. +%package osclib +Summary: OSCLib Library +License: GPLv2+ and MIT +Requires: %{name} = %{version}-%{release} + +%description osclib +Faust AUdio STreams is a functional programming language for real-time audio +signal processing. This package provides osclib. + +%package osclib-devel +Summary: Headers for the OSCLib Library +License: GPLv2+ and MIT +Requires: %{name}-osclib = %{version}-%{release} + +%description osclib-devel +Faust AUdio STreams is a functional programming language for real-time audio +signal processing. This package provides the development files for osclib. + + %package tools Summary: 3rd party tools written for %{name} -Group: Development/Languages License: GPLv2+ BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name}-osclib-devel = %{version}-%{release} %description tools Faust AUdio STreams is a functional programming language for real-time audio @@ -55,7 +73,6 @@ to help the building process of applications and plugins with Faust. %package kate Summary: Kate/Kwrite plugin for %{name} -Group: Applications/Editors License: GPLv2+ BuildArch: noarch Requires: %{name} = %{version}-%{release} @@ -68,21 +85,28 @@ for KDE's Kate/Kwrite. %prep %setup -q +%patch0 -p1 # For installation in the correct location and for preserving timestamps: # The Makefile normally puts noarch files in $prefix/lib. We change # this to $prefix/share -sed -i -e 's|/lib|/share|g' \ +# Also don't build the osclib until upstream supports shared libs +# -e '/osclib/d' \ +sed -i -e 's|/lib/|/share/|g' \ -e 's| -r | -pr |' \ -e 's| -m | -pm |' \ Makefile sed -i 's|/lib|/share|g' compiler/parser/enrobage.cpp +sed -i 's|install |install -pm 755 |' tools/faust2appls/Makefile # Fix optflags -sed -i 's|-O3|%{optflags}|' compiler/Makefile.unix +sed -i 's|-O3|%{optflags} -fPIC |' compiler/Makefile.unix \ + architecture/osclib/faust/Makefile \ + architecture/osclib/oscpack/Makefile # Fix permissions chmod -x compiler/draw/device/SVGDev.* architecture/VST/PkgInfo +chmod +x tools/faust2appls/faust2* # Fix encoding for i in examples syntax-highlighting; do @@ -91,15 +115,24 @@ for i in examples syntax-highlighting; do mv -f tmpfile $i/README done +# To distinguish doc files +for i in changelog license readme; do + mv architecture/osclib/faust/$i.txt architecture/osclib/faust/$i.faustOSC.txt +done +for i in CHANGES LICENSE README TODO; do + mv architecture/osclib/oscpack/$i architecture/osclib/oscpack/$i.osscpack.txt +done + + %build # Build the main executable -make PREFIX=%{_prefix} %{?_smp_mflags} +make PREFIX=%{_prefix} LIBDIR=%{_libdir} %{?_smp_mflags} %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} -make install PREFIX=%{_prefix} DESTDIR=%{buildroot} +mkdir -p %{buildroot}%{_datadir}/%{name} +make install PREFIX=%{_prefix} LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir} DESTDIR=%{buildroot} # Sort out the documentation mv documentation/faust-quick-reference-src/illustrations/ documentation @@ -117,30 +150,38 @@ mkdir -p %{buildroot}%{_datadir}/kde4/apps/katepart/syntax/ cp -a syntax-highlighting/%{name}.xml \ %{buildroot}%{_datadir}/kde4/apps/katepart/syntax/ -%clean -rm -rf %{buildroot} + +%post osclib -p /sbin/ldconfig +%postun osclib -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc COPYING README examples WHATSNEW %{_bindir}/%{name} %{_datadir}/%{name}/ +%files osclib +%doc architecture/osclib/*.txt architecture/osclib/faust/*.txt architecture/osclib/oscpack/*.txt +%{_libdir}/*.so.* + +%files osclib-devel +%{_libdir}/*.so +%{_includedir}/*.h + %files doc -%defattr(-,root,root,-) %doc documentation/* %files tools -%defattr(-,root,root,-) -%doc tools/README README.supercollider README.appls tools/%{name}2pd-* +%doc tools/README README.supercollider README.appls tools/%{name}2pd %{_bindir}/%{name}2* %files kate -%defattr(-,root,root,-) %doc syntax-highlighting/README %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml %changelog +* Fri Nov 25 2011 Orcan Ogetbil - 0.9.43-1 +- Update to 0.9.43 + * Tue Feb 08 2011 Fedora Release Engineering - 0.9.30-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index dbf7bfb..063a269 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aee067c8f2183949a6f5ea2556f1934a faust-0.9.30.tar.gz +4465e2002fdba0676476b8c2873a4985 faust-0.9.43.tar.gz