diff --git a/.gitignore b/.gitignore index 1732409..38695b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/rubberband-1.8.1.tar.bz2 +/rubberband-1.8.2.tar.bz2 diff --git a/rubberband-1.5.0-mk.patch b/rubberband-1.5.0-mk.patch deleted file mode 100644 index 824c3db..0000000 --- a/rubberband-1.5.0-mk.patch +++ /dev/null @@ -1,43 +0,0 @@ -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%,@prefix@," rubberband.pc.in \ diff --git a/rubberband-1.8.2-mk.patch b/rubberband-1.8.2-mk.patch new file mode 100644 index 0000000..d2c93c3 --- /dev/null +++ b/rubberband-1.8.2-mk.patch @@ -0,0 +1,44 @@ +--- rubberband-1.8.2/Makefile.in.mk 2018-05-15 10:43:39.000000000 -0700 ++++ rubberband-1.8.2/Makefile.in 2018-10-17 20:42:02.869414480 -0700 +@@ -20,11 +20,11 @@ + + 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 := $(INSTALL_LIBDIR)/vamp ++INSTALL_LADSPADIR := $(INSTALL_LIBDIR)/ladspa + INSTALL_LRDFDIR := $(PREFIX)/share/ladspa/rdf +-INSTALL_PKGDIR := $(PREFIX)/lib/pkgconfig ++INSTALL_PKGDIR := $(INSTALL_LIBDIR)/pkgconfig + + LIBNAME := librubberband + JNINAME := librubberband-jni +@@ -174,19 +174,17 @@ + $(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)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION) + rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION) +- rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) +- cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) ++ cp -p $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) + ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION) + ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION) +- cp -f $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) +- 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%,$(PREFIX)," rubberband.pc.in \ diff --git a/rubberband.spec b/rubberband.spec index 7814b6e..abf7630 100644 --- a/rubberband.spec +++ b/rubberband.spec @@ -1,17 +1,20 @@ Name: rubberband -Version: 1.8.1 -Release: 13%{?dist} +Version: 1.8.2 +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://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2 -Patch0: %{name}-1.5.0-mk.patch +Source0: https://breakfastquay.com/files/releases/%{name}-%{version}.tar.bz2 +Patch0: %{name}-1.8.2-mk.patch BuildRequires: gcc-c++ -BuildRequires: fftw-devel libsamplerate-devel libsndfile-devel -BuildRequires: ladspa-devel vamp-plugin-sdk-devel +BuildRequires: ladspa-devel +BuildRequires: pkgconfig(fftw3) +BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(sndfile) +BuildRequires: vamp-plugin-sdk-devel + Requires: ladspa %description @@ -21,8 +24,7 @@ tempo and pitch of an audio recording independently of one another. %package devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -31,19 +33,17 @@ developing applications that use %{name}. %prep -%setup -q -%patch0 -p1 -b .mk +%autosetup -p1 sed -i 's|{exec_prefix}/lib|{exec_prefix}/%{_lib}|' rubberband.pc.in %build %configure --disable-static -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a @@ -54,7 +54,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a %files -%doc COPYING README.txt +%license COPYING +%doc README.txt %{_bindir}/rubberband %{_libdir}/*.so.* %{_libdir}/ladspa/ladspa-rubberband.* @@ -69,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a %changelog +* Wed Oct 17 2018 Michel Alexandre Salim - 1.8.2-1 +- Update to 1.8.2 + * Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index c63da4f..74b9d42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c2b4e18a714bcc297d0db81a10f9348 rubberband-1.8.1.tar.bz2 +SHA512 (rubberband-1.8.2.tar.bz2) = da677f9a843711c44c52c0153faa62e587ac7c010569523ef4fef7ce941b9d292e566f46147700e496f6cfff4c9f22f9901dcc93f2d701fdb9de152ddac0c3a6