packages: vamp/vamp.spec, vamp/gcc4.patch (NEW) - update patches: install, ...

[sls]

Author: sls                          Date: Thu Feb  4 22:55:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update patches: install, optflags, link OUT, gcc4 IN
- more verbose files
- now using ./configure
- updated BR
- rel. 1
- more TODO

---- Files affected:
packages/vamp:
   vamp.spec (1.11 -> 1.12) , gcc4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vamp/vamp.spec
diff -u packages/vamp/vamp.spec:1.11 packages/vamp/vamp.spec:1.12
--- packages/vamp/vamp.spec:1.11	Thu Feb  4 23:01:40 2010
+++ packages/vamp/vamp.spec	Thu Feb  4 23:55:48 2010
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO:
 # - create more subpackages? (vamp-sdk, vamp-hostsdk)
+# - unpackaged programs
 #
 %define	vampplugindir	%{_libdir}/vamp
 
@@ -8,17 +9,17 @@
 Summary(pl.UTF-8):	vamp - API dla wtyczek analizy i wydobywania cech dźwięku
 Name:		vamp
 Version:	2.1
-Release:	0.1
+Release:	1
 License:	BSD-like
 Group:		Libraries
 %define		_srcname	vamp-plugin-sdk
 Source0:	http://dl.sourceforge.net/vamp/%{_srcname}-%{version}.tar.gz
 # Source0-md5:	13252077a73987dae72a9174e529b6b9
-Patch0:		%{name}-install.patch
-Patch1:		%{name}-optflags.patch
-Patch2:		%{name}-link.patch
+Patch0:		gcc4.patch
 URL:		http://www.vamp-plugins.org/
+BuildRequires:	libsndfile-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,23 +72,16 @@
 %prep
 %setup -q -n %{_srcname}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-%{__make} \
-	OPTFLAGS="%{rpmcxxflags}" \
-	LDFLAGS="%{rpmldflags}"
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	PREFIX=%{_prefix} \
-	LIB=%{_lib} \
 	DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{vampplugindir}
-install examples/*.so $RPM_BUILD_ROOT%{vampplugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,25 +92,32 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYING README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%ghost %attr(755,root,root) %{_libdir}/lib*.so.?
+%attr(755,root,root) %{_libdir}/libvamp-hostsdk.*.*.*
+%attr(755,root,root) %{_libdir}/libvamp-sdk.*.*.*
+%ghost %attr(755,root,root) %{_libdir}/libvamp-hostsdk.so.3
+%ghost %attr(755,root,root) %{_libdir}/libvamp-sdk.so.2
 %dir %{vampplugindir}
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libvamp-hostsdk.so
+%attr(755,root,root) %{_libdir}/libvamp-sdk.so
+%{_libdir}/libvamp-hostsdk.la
+%{_libdir}/libvamp-sdk.la
 %{_includedir}/vamp
+%{_includedir}/vamp-hostsdk
 %{_includedir}/vamp-sdk
 %{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libvamp-hostsdk.a
+%{_libdir}/libvamp-sdk.a
 
 %files plugins-example
 %defattr(644,root,root,755)
-%attr(755,root,root) %{vampplugindir}/*so
+%attr(755,root,root) %{vampplugindir}/vamp-example-plugins.cat
+%attr(755,root,root) %{vampplugindir}/vamp-example-plugins.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -124,6 +125,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/02/04 22:55:48  sls
+- update patches: install, optflags, link OUT, gcc4 IN
+- more verbose files
+- now using ./configure
+- updated BR
+- rel. 1
+- more TODO
+
 Revision 1.11  2010/02/04 22:01:40  sls
 - ver. 2.1 (NFY)
 

================================================================
Index: packages/vamp/gcc4.patch
diff -u /dev/null packages/vamp/gcc4.patch:1.1
--- /dev/null	Thu Feb  4 23:55:54 2010
+++ packages/vamp/gcc4.patch	Thu Feb  4 23:55:48 2010
@@ -0,0 +1,11 @@
+--- vamp-plugin-sdk-2.1/examples/FixedTempoEstimator.cpp.orig	2010-02-04 23:10:21.481340112 +0100
++++ vamp-plugin-sdk-2.1/examples/FixedTempoEstimator.cpp	2010-02-04 23:10:38.089880639 +0100
+@@ -44,7 +44,7 @@ using std::endl;
+ using Vamp::RealTime;
+ 
+ #include <cmath>
+-
++#include <cstdio>
+ 
+ class FixedTempoEstimator::D
+ // this class just avoids us having to declare any data members in the header
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vamp/vamp.spec?r1=1.11&r2=1.12&f=u