From b886281f9c8efe38c1bf3ca59b12729d0b8f3cbf Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:50:41 +0000 Subject: [PATCH 1/9] Initialize branch F-10 for vamp-plugin-sdk --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From a6d510064501d49148b7c4df12d5aae678ca0acc Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 15 Dec 2008 02:23:22 +0000 Subject: [PATCH 2/9] - Update to 2.0 --- .cvsignore | 2 +- sources | 2 +- vamp-plugin-sdk.spec | 16 +++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3799a20..8fa6f55 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vamp-plugin-sdk-1.3.tar.gz +vamp-plugin-sdk-2.0.tar.gz diff --git a/sources b/sources index 007f993..3be1637 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0bc2c066776310631a02cd192735da7 vamp-plugin-sdk-1.3.tar.gz +6f52328254330389d130a61f8def8afc vamp-plugin-sdk-2.0.tar.gz diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index 37bbbd3..91d9c1b 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,5 +1,5 @@ Name: vamp-plugin-sdk -Version: 1.3 +Version: 2.0 Release: 1%{?dist} Summary: An API for audio analysis and feature extraction plugins @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: BSD URL: http://www.vamp-plugins.org/ Source0: http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-%{version}.tar.gz -Patch0: %{name}-1.3-mk.patch +Patch0: %{name}-2.0-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsndfile-devel @@ -39,18 +39,19 @@ developing static applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .mk +%patch0 -p1 -b .libdir %build -CXXFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # 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 DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -82,10 +83,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING README %{_libdir}/*.so.* +%{_libdir}/vamp %files devel %defattr(-,root,root,-) %doc examples +%{_bindir}/vamp-* %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -96,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 14 2008 Michel Salim - 2.0-1 +- Update to 2.0 + * Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 - Update to 1.3 From 9ba4fcf3eaac1761bdeb1b58cb0685b26b652f73 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 15 Dec 2008 02:33:16 +0000 Subject: [PATCH 3/9] Update patches for F-{9,10} --- vamp-plugin-sdk-1.3-mk.patch | 44 -------------------------------- vamp-plugin-sdk-2.0-libdir.patch | 22 ++++++++++++++++ 2 files changed, 22 insertions(+), 44 deletions(-) delete mode 100644 vamp-plugin-sdk-1.3-mk.patch create mode 100644 vamp-plugin-sdk-2.0-libdir.patch diff --git a/vamp-plugin-sdk-1.3-mk.patch b/vamp-plugin-sdk-1.3-mk.patch deleted file mode 100644 index 14f6483..0000000 --- a/vamp-plugin-sdk-1.3-mk.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- vamp-plugin-sdk-1.3/Makefile.mk 2008-07-09 06:42:49.000000000 -0400 -+++ vamp-plugin-sdk-1.3/Makefile 2008-07-17 18:21:02.000000000 -0400 -@@ -28,7 +28,7 @@ - - # Compile flags - # --CXXFLAGS := $(CXXFLAGS) -O2 -Wall -I. -fPIC -+CXXFLAGS := $(CXXFLAGS) -I. -fPIC - - # ar, ranlib - # -@@ -40,8 +40,8 @@ - # because our plugin exposes only a C API so there are no boundary - # compatibility problems.) - # --#PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a --PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a) -+PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a -+#PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a) - - # File extension for a dynamically loadable object - # -@@ -58,10 +58,11 @@ - # have to use "make install". - # - INSTALL_PREFIX := /usr/local -+LIB := /lib - INSTALL_API_HEADERS := $(INSTALL_PREFIX)/include/vamp - INSTALL_SDK_HEADERS := $(INSTALL_PREFIX)/include/vamp-sdk - INSTALL_HOSTEXT_HEADERS := $(INSTALL_PREFIX)/include/vamp-sdk/hostext --INSTALL_SDK_LIBS := $(INSTALL_PREFIX)/lib -+INSTALL_SDK_LIBS := $(INSTALL_PREFIX)$(LIB) - - INSTALL_SDK_LIBNAME := libvamp-sdk.so.1.1.1 - INSTALL_SDK_LINK_ABI := libvamp-sdk.so.1 -@@ -75,7 +76,7 @@ - INSTALL_HOSTSDK_STATIC := libvamp-hostsdk.a - INSTALL_HOSTSDK_LA := libvamp-hostsdk.la - --INSTALL_PKGCONFIG := $(INSTALL_PREFIX)/lib/pkgconfig -+INSTALL_PKGCONFIG := $(INSTALL_PREFIX)$(LIB)/pkgconfig - - # Flags required to tell the compiler to create a dynamically loadable object - # diff --git a/vamp-plugin-sdk-2.0-libdir.patch b/vamp-plugin-sdk-2.0-libdir.patch new file mode 100644 index 0000000..b0e0bd1 --- /dev/null +++ b/vamp-plugin-sdk-2.0-libdir.patch @@ -0,0 +1,22 @@ +--- vamp-plugin-sdk-2.0/Makefile.in.libdir 2008-12-01 06:48:41.000000000 -0500 ++++ vamp-plugin-sdk-2.0/Makefile.in 2008-12-14 17:04:13.000000000 -0500 +@@ -71,8 +71,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.0.0 +@@ -87,7 +87,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 + # From 2a93b0d5912d446f6b8ea697d413be74808b3163 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 30 Dec 2008 06:26:38 +0000 Subject: [PATCH 4/9] - More libdir fixes (bug #469777) --- vamp-plugin-sdk.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index 91d9c1b..6e480a1 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,6 +1,6 @@ Name: vamp-plugin-sdk Version: 2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An API for audio analysis and feature extraction plugins Group: System Environment/Libraries @@ -40,6 +40,7 @@ developing static applications that use %{name}. %prep %setup -q %patch0 -p1 -b .libdir +sed -i 's|/lib/vamp|/%{_lib}/vamp|g' src/vamp-hostsdk/PluginHostAdapter.cpp %build @@ -51,7 +52,7 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT # fix libdir find . -name '*.pc.in' -exec sed -i 's|/lib|/%{_lib}|' {} ';' -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT #INSTALL_PREFIX=%{_prefix} LIB=/%{_lib} find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -99,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 30 2008 Michel Salim - 2.0-2 +- More libdir fixes (bug #469777) + * Sun Dec 14 2008 Michel Salim - 2.0-1 - Update to 2.0 From c8ab89aee08942602b04e698301bba50f1a7ee35 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 30 Dec 2008 06:45:48 +0000 Subject: [PATCH 5/9] - libdir fix (bug #469777) --- .cvsignore | 2 +- sources | 2 +- vamp-plugin-sdk.spec | 24 +++++++++--------------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8fa6f55..3799a20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vamp-plugin-sdk-2.0.tar.gz +vamp-plugin-sdk-1.3.tar.gz diff --git a/sources b/sources index 3be1637..007f993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f52328254330389d130a61f8def8afc vamp-plugin-sdk-2.0.tar.gz +d0bc2c066776310631a02cd192735da7 vamp-plugin-sdk-1.3.tar.gz diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index 6e480a1..7428410 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,5 +1,5 @@ Name: vamp-plugin-sdk -Version: 2.0 +Version: 1.3 Release: 2%{?dist} Summary: An API for audio analysis and feature extraction plugins @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: BSD URL: http://www.vamp-plugins.org/ Source0: http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-%{version}.tar.gz -Patch0: %{name}-2.0-libdir.patch +Patch0: %{name}-1.3-mk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsndfile-devel @@ -39,20 +39,19 @@ developing static applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .libdir -sed -i 's|/lib/vamp|/%{_lib}/vamp|g' src/vamp-hostsdk/PluginHostAdapter.cpp +%patch0 -p1 -b .mk +sed -i 's|/lib/vamp|/%{_lib}/vamp|g' vamp-sdk/PluginHostAdapter.cpp %build -%configure -make %{?_smp_mflags} +CXXFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # 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 DESTDIR=$RPM_BUILD_ROOT INSTALL_PREFIX=%{_prefix} LIB=/%{_lib} find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -84,12 +83,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING README %{_libdir}/*.so.* -%{_libdir}/vamp %files devel %defattr(-,root,root,-) %doc examples -%{_bindir}/vamp-* %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -100,13 +97,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Dec 30 2008 Michel Salim - 2.0-2 -- More libdir fixes (bug #469777) +* Tue Dec 30 2008 Michel Salim - 1.3-2 +- libdir fix (bug #469777) -* Sun Dec 14 2008 Michel Salim - 2.0-1 -- Update to 2.0 - -* Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 +* Thu Jul 17 2008 Michel Salim - 1.3-1 - Update to 1.3 * Thu Jan 31 2008 Michel Salim - 1.1b-4 From b3a7db628d7972d66dbea6f3adc144347cccbff4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 30 Dec 2008 06:49:23 +0000 Subject: [PATCH 6/9] Replace patch files with the appropriate versions --- vamp-plugin-sdk-1.3-mk.patch | 44 ++++++++++++++++++++++++++++++++ vamp-plugin-sdk-2.0-libdir.patch | 22 ---------------- 2 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 vamp-plugin-sdk-1.3-mk.patch delete mode 100644 vamp-plugin-sdk-2.0-libdir.patch diff --git a/vamp-plugin-sdk-1.3-mk.patch b/vamp-plugin-sdk-1.3-mk.patch new file mode 100644 index 0000000..14f6483 --- /dev/null +++ b/vamp-plugin-sdk-1.3-mk.patch @@ -0,0 +1,44 @@ +--- vamp-plugin-sdk-1.3/Makefile.mk 2008-07-09 06:42:49.000000000 -0400 ++++ vamp-plugin-sdk-1.3/Makefile 2008-07-17 18:21:02.000000000 -0400 +@@ -28,7 +28,7 @@ + + # Compile flags + # +-CXXFLAGS := $(CXXFLAGS) -O2 -Wall -I. -fPIC ++CXXFLAGS := $(CXXFLAGS) -I. -fPIC + + # ar, ranlib + # +@@ -40,8 +40,8 @@ + # because our plugin exposes only a C API so there are no boundary + # compatibility problems.) + # +-#PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a +-PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a) ++PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a ++#PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a) + + # File extension for a dynamically loadable object + # +@@ -58,10 +58,11 @@ + # have to use "make install". + # + INSTALL_PREFIX := /usr/local ++LIB := /lib + INSTALL_API_HEADERS := $(INSTALL_PREFIX)/include/vamp + INSTALL_SDK_HEADERS := $(INSTALL_PREFIX)/include/vamp-sdk + INSTALL_HOSTEXT_HEADERS := $(INSTALL_PREFIX)/include/vamp-sdk/hostext +-INSTALL_SDK_LIBS := $(INSTALL_PREFIX)/lib ++INSTALL_SDK_LIBS := $(INSTALL_PREFIX)$(LIB) + + INSTALL_SDK_LIBNAME := libvamp-sdk.so.1.1.1 + INSTALL_SDK_LINK_ABI := libvamp-sdk.so.1 +@@ -75,7 +76,7 @@ + INSTALL_HOSTSDK_STATIC := libvamp-hostsdk.a + INSTALL_HOSTSDK_LA := libvamp-hostsdk.la + +-INSTALL_PKGCONFIG := $(INSTALL_PREFIX)/lib/pkgconfig ++INSTALL_PKGCONFIG := $(INSTALL_PREFIX)$(LIB)/pkgconfig + + # Flags required to tell the compiler to create a dynamically loadable object + # diff --git a/vamp-plugin-sdk-2.0-libdir.patch b/vamp-plugin-sdk-2.0-libdir.patch deleted file mode 100644 index b0e0bd1..0000000 --- a/vamp-plugin-sdk-2.0-libdir.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- vamp-plugin-sdk-2.0/Makefile.in.libdir 2008-12-01 06:48:41.000000000 -0500 -+++ vamp-plugin-sdk-2.0/Makefile.in 2008-12-14 17:04:13.000000000 -0500 -@@ -71,8 +71,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.0.0 -@@ -87,7 +87,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 - # From 1c4f7e05fcb506800e17d58913c52081b531fe85 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sun, 15 Feb 2009 03:09:57 +0000 Subject: [PATCH 7/9] - More libdir fix (bug #469777) --- vamp-plugin-sdk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index 7428410..0939217 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,6 +1,6 @@ Name: vamp-plugin-sdk Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An API for audio analysis and feature extraction plugins Group: System Environment/Libraries @@ -41,6 +41,7 @@ developing static applications that use %{name}. %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 @@ -97,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From b6168dbda4f00e4794a437bc075f007e3bffc706 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:11:46 +0000 Subject: [PATCH 8/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 882f694..4f35bfc 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vamp-plugin-sdk -# $Id$ +# $Id: Makefile,v 1.1 2008/01/31 04:48:43 ausil Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7cc21edcb35db5f143890ed81f65ab6622d3578a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:53:29 +0000 Subject: [PATCH 9/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 4f35bfc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vamp-plugin-sdk -# $Id: Makefile,v 1.1 2008/01/31 04:48:43 ausil Exp $ -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 $$d/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/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10