rpms/rubberband/devel rubberband-1.5.0-gcc44.patch, NONE, 1.1 rubberband-1.5.0-mk.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rubberband.spec, 1.6, 1.7 sources, 1.3, 1.4 rubberband-1.2-gcc43.patch, 1.1, NONE rubberband-1.2-gcc44.patch, 1.1, NONE rubberband-1.2-mk.patch, 1.1, NONE

Tom Callaway spot at fedoraproject.org
Wed Jun 2 13:34:36 UTC 2010


Author: spot

Update of /cvs/pkgs/rpms/rubberband/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21543

Modified Files:
	.cvsignore rubberband.spec sources 
Added Files:
	rubberband-1.5.0-gcc44.patch rubberband-1.5.0-mk.patch 
Removed Files:
	rubberband-1.2-gcc43.patch rubberband-1.2-gcc44.patch 
	rubberband-1.2-mk.patch 
Log Message:
1.5.0, get rid of static libs

rubberband-1.5.0-gcc44.patch:
 RubberBandVampPlugin.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE rubberband-1.5.0-gcc44.patch ---
diff -up rubberband-1.5.0/vamp/RubberBandVampPlugin.cpp.gcc44 rubberband-1.5.0/vamp/RubberBandVampPlugin.cpp
--- rubberband-1.5.0/vamp/RubberBandVampPlugin.cpp.gcc44	2010-06-02 09:21:14.510350757 -0400
+++ rubberband-1.5.0/vamp/RubberBandVampPlugin.cpp	2010-06-02 09:21:25.649356553 -0400
@@ -18,6 +18,7 @@
 #include "system/sysutils.h"
 
 #include <cmath>
+#include <cstdio>
 
 using std::string;
 using std::vector;

rubberband-1.5.0-mk.patch:
 Makefile.in |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE rubberband-1.5.0-mk.patch ---
diff -up rubberband-1.5.0/Makefile.in.mk rubberband-1.5.0/Makefile.in
--- rubberband-1.5.0/Makefile.in.mk	2010-05-02 15:06:05.000000000 -0400
+++ rubberband-1.5.0/Makefile.in	2010-06-02 09:23:57.045227845 -0400
@@ -28,11 +28,11 @@ LADSPA_TARGET  		:= lib/ladspa-rubberban
 
 INSTALL_BINDIR		:= @prefix@/bin
 INSTALL_INCDIR		:= @prefix@/include/rubberband
-INSTALL_LIBDIR		:= @prefix@/lib
-INSTALL_VAMPDIR		:= @prefix@/lib/vamp
-INSTALL_LADSPADIR	:= @prefix@/lib/ladspa
+INSTALL_LIBDIR		:= @libdir@
+INSTALL_VAMPDIR		:= @libdir@/vamp
+INSTALL_LADSPADIR	:= @libdir@/ladspa
 INSTALL_LRDFDIR		:= @prefix@/share/ladspa/rdf
-INSTALL_PKGDIR		:= @prefix@/lib/pkgconfig
+INSTALL_PKGDIR		:= @libdir@/pkgconfig
 
 all:	bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
 
@@ -144,17 +144,17 @@ install:	all
 	$(MKDIR) -p $(DESTDIR)$(INSTALL_LADSPADIR)
 	$(MKDIR) -p $(DESTDIR)$(INSTALL_LRDFDIR)
 	$(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR)
-	cp $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR)
-	cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
-	cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
+	cp -p $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR)
+	cp -p $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
+	cp -p $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
 	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
 	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
-	cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION)
+	cp -p $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION)
 	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
 	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
-	cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
+	cp -p $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
 	cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR)
-	cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
+	cp -p $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
 	cp ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
 	cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
 	sed "s,%PREFIX%, at prefix@," rubberband.pc.in \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubberband/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Jul 2008 23:44:13 -0000	1.3
+++ .cvsignore	2 Jun 2010 13:34:35 -0000	1.4
@@ -1 +1 @@
-rubberband-1.2.tar.bz2
+rubberband-1.5.0.tar.bz2


Index: rubberband.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubberband/devel/rubberband.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rubberband.spec	27 Jul 2009 03:19:44 -0000	1.6
+++ rubberband.spec	2 Jun 2010 13:34:36 -0000	1.7
@@ -1,15 +1,14 @@
 Name:           rubberband
-Version:        1.2
-Release:        5%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Audio time-stretching and pitch-shifting library
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.breakfastquay.com/rubberband/
 Source0:        http://www.breakfastquay.com/rubberband/files/rubberband-%{version}.tar.bz2
-Patch0:         rubberband-1.2-gcc43.patch
-Patch1:         rubberband-1.2-gcc44.patch
-Patch2:         rubberband-1.2-mk.patch
+Patch0:         rubberband-1.5.0-gcc44.patch
+Patch1:         rubberband-1.5.0-mk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fftw-devel libsamplerate-devel libsndfile-devel
@@ -34,9 +33,8 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
-%patch1 -p1 -b .gcc44
-%patch2 -p1 -b .mk
+%patch0 -p1 -b .gcc44
+%patch1 -p1 -b .mk
 
 
 %build
@@ -48,7 +46,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README.txt
 %{_bindir}/rubberband
 %{_libdir}/*.so.*
 %{_libdir}/ladspa/ladspa-rubberband.*
@@ -72,12 +70,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc
 %{_includedir}/*
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/rubberband.pc
 
 
 %changelog
+* Wed Jun  2 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.0-1
+- update to 1.5.0
+- disable static libs
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubberband/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jul 2008 23:44:13 -0000	1.3
+++ sources	2 Jun 2010 13:34:36 -0000	1.4
@@ -1 +1 @@
-9092a73906fd56c3e733fd955b802736  rubberband-1.2.tar.bz2
+c5f288d644fcd46bd159e187bcc33f25  rubberband-1.5.0.tar.bz2


--- rubberband-1.2-gcc43.patch DELETED ---


--- rubberband-1.2-gcc44.patch DELETED ---


--- rubberband-1.2-mk.patch DELETED ---



More information about the scm-commits mailing list