diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 882f694..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vamp-plugin-sdk -# $Id$ -NAME := vamp-plugin-sdk -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index 37bbbd3..0939217 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,6 +1,6 @@ Name: vamp-plugin-sdk Version: 1.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: An API for audio analysis and feature extraction plugins Group: System Environment/Libraries @@ -40,6 +40,8 @@ developing static applications that use %{name}. %prep %setup -q %patch0 -p1 -b .mk +sed -i 's|/lib/vamp|/%{_lib}/vamp|g' vamp-sdk/PluginHostAdapter.cpp +sed -i 's|"/lib/"|"/%{_lib}/"|g' vamp-sdk/hostext/PluginLoader.cpp %build @@ -96,7 +98,13 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 +* Sat Feb 14 2009 Michel Salim - 1.3-3 +- More libdir fix (bug #469777) + +* Tue Dec 30 2008 Michel Salim - 1.3-2 +- libdir fix (bug #469777) + +* Thu Jul 17 2008 Michel Salim - 1.3-1 - Update to 1.3 * Thu Jan 31 2008 Michel Salim - 1.1b-4