From daa41865b84b473f89cb5cbc97ff152c26c388bd Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Oct 18 2018 04:02:00 +0000 Subject: Update to 2.7.1 --- diff --git a/.gitignore b/.gitignore index 16067e7..463befc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/vamp-plugin-sdk-2.5.tar.gz +/vamp-plugin-sdk-2.7.1.tar.gz diff --git a/sources b/sources index 3b030fb..56e6a08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -199872997f74951f6769b982bf0d0646 vamp-plugin-sdk-2.5.tar.gz +SHA512 (vamp-plugin-sdk-2.7.1.tar.gz) = 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 diff --git a/vamp-plugin-sdk-2.5-libdir.patch b/vamp-plugin-sdk-2.5-libdir.patch deleted file mode 100644 index eee5f02..0000000 --- a/vamp-plugin-sdk-2.5-libdir.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- vamp-plugin-sdk-2.5/Makefile.in.libdir 2013-05-08 16:36:02.000000000 +0700 -+++ vamp-plugin-sdk-2.5/Makefile.in 2013-06-19 18:11:42.065277534 +0700 -@@ -73,8 +73,8 @@ - INSTALL_API_HEADERS = $(INSTALL_PREFIX)/include/vamp - INSTALL_SDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-sdk - INSTALL_HOSTSDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-hostsdk --INSTALL_SDK_LIBS = $(INSTALL_PREFIX)/lib --INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp -+INSTALL_SDK_LIBS = @libdir@ -+INSTALL_PLUGINS = $(INSTALL_SDK_LIBS)/vamp - INSTALL_BINARIES = $(INSTALL_PREFIX)/bin - - INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.5.0 -@@ -89,7 +89,7 @@ - INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a - INSTALL_HOSTSDK_LA = libvamp-hostsdk.la - --INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig -+INSTALL_PKGCONFIG = $(INSTALL_SDK_LIBS)/pkgconfig - - # Flags required to tell the compiler to create a dynamically loadable object - # diff --git a/vamp-plugin-sdk-2.7.1-libdir.patch b/vamp-plugin-sdk-2.7.1-libdir.patch new file mode 100644 index 0000000..d665984 --- /dev/null +++ b/vamp-plugin-sdk-2.7.1-libdir.patch @@ -0,0 +1,22 @@ +--- vamp-plugin-sdk-2.7.1/Makefile.in.libdir 2017-03-06 05:27:24.000000000 -0800 ++++ vamp-plugin-sdk-2.7.1/Makefile.in 2018-10-17 20:58:05.590946737 -0700 +@@ -74,8 +74,8 @@ + INSTALL_API_HEADERS = $(INSTALL_PREFIX)/include/vamp + INSTALL_SDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-sdk + INSTALL_HOSTSDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-hostsdk +-INSTALL_SDK_LIBS = $(INSTALL_PREFIX)/lib +-INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp ++INSTALL_SDK_LIBS = @libdir@ ++INSTALL_PLUGINS = $(INSTALL_SDK_LIBS)/vamp + INSTALL_BINARIES = $(INSTALL_PREFIX)/bin + + INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.7.0 +@@ -90,7 +90,7 @@ + INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a + INSTALL_HOSTSDK_LA = libvamp-hostsdk.la + +-INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig ++INSTALL_PKGCONFIG = $(INSTALL_SDK_LIBS)/pkgconfig + + # Flags required to tell the compiler to create a dynamically loadable object + # diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index a64e912..206f724 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,14 +1,12 @@ Name: vamp-plugin-sdk -Version: 2.5 -Release: 13%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: An API for audio analysis and feature extraction plugins -Group: System Environment/Libraries License: BSD URL: http://www.vamp-plugins.org/ -Source0: http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz -# https://sourceforge.net/tracker/?func=detail&aid=1884043&group_id=192001&atid=939644 -Patch0: %{name}-2.5-libdir.patch +Source0: https://code.soundsoftware.ac.uk/attachments/download/2206/%{name}-%{version}.tar.gz +Patch0: %{name}-2.7.1-libdir.patch BuildRequires: gcc-c++ BuildRequires: libsndfile-devel @@ -21,7 +19,7 @@ to produce descriptive output (measurements or semantic observations). %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -39,21 +37,20 @@ developing static applications that use %{name}. %prep -%setup -q -%patch0 -p1 -b .libdir +%autosetup -p1 sed -i 's|/lib/vamp|/%{_lib}/vamp|g' src/vamp-hostsdk/PluginHostAdapter.cpp sed -i 's|/lib/|/%{_lib}/|g' src/vamp-hostsdk/PluginLoader.cpp %build %configure -make %{?_smp_mflags} +%make_build %install # fix libdir find . -name '*.pc.in' -exec sed -i 's|/lib|/%{_lib}|' {} ';' -make install DESTDIR=$RPM_BUILD_ROOT #INSTALL_PREFIX=%{_prefix} LIB=/%{_lib} +%make_install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -78,14 +75,14 @@ make clean [ $(strings ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.?|grep /lib|sed -e 's!/%{_lib}!/__FEDORA-LIB__!g'|grep -c /lib) -eq 0 ] - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc COPYING README +%license COPYING +%doc README %{_libdir}/*.so.* %{_libdir}/vamp @@ -101,6 +98,9 @@ make clean %changelog +* Wed Oct 17 2018 Michel Alexandre Salim - 2.7.1-1 +- Update to 2.7.1 + * Sat Jul 14 2018 Fedora Release Engineering - 2.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild