diff --git a/speexdsp-1.2.1.tar.gz b/speexdsp-1.2.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..45ce0000b5be16accfe50a7cef4124ee8aa7c8d4 Binary files /dev/null and b/speexdsp-1.2.1.tar.gz differ diff --git a/speexdsp-1.2rc3.tar.gz b/speexdsp-1.2rc3.tar.gz deleted file mode 100644 index 23d72287c04d2752fb728fe12033307cca22daf1..0000000000000000000000000000000000000000 Binary files a/speexdsp-1.2rc3.tar.gz and /dev/null differ diff --git a/speexdsp-fixbuilds-774c87d.patch b/speexdsp-fixbuilds-774c87d.patch deleted file mode 100644 index c02ee29bd7dc932aa9e3bc81da008b773063471b..0000000000000000000000000000000000000000 --- a/speexdsp-fixbuilds-774c87d.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 2cd2d1e..1de0c23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -334,6 +334,12 @@ AC_SUBST([USIZE16]) - AC_SUBST([SIZE32]) - AC_SUBST([USIZE32]) - -+AS_IF([test "$ac_cv_header_stdint_h" = "yes"], [INCLUDE_STDINT="#include "], -+ [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include "], -+ [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include "]) -+ -+AC_SUBST([INCLUDE_STDINT]) -+ - AC_CONFIG_FILES([ - Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec - include/Makefile include/speex/Makefile speexdsp.pc -diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in -index 02b82fd..5ea7b55 100644 ---- a/include/speex/speexdsp_config_types.h.in -+++ b/include/speex/speexdsp_config_types.h.in -@@ -1,13 +1,7 @@ - #ifndef __SPEEX_TYPES_H__ - #define __SPEEX_TYPES_H__ - --#if defined HAVE_STDINT_H --# include --#elif defined HAVE_INTTYPES_H --# include --#elif defined HAVE_SYS_TYPES_H --# include --#endif -+@INCLUDE_STDINT@ - - typedef @SIZE16@ spx_int16_t; - typedef @USIZE16@ spx_uint16_t; diff --git a/speexdsp.spec b/speexdsp.spec index d7a29483f189eec8d613f2078105c06b706cd15c..e2dd3c55cbe95268dc5257a5a380fbc1333e21e5 100644 --- a/speexdsp.spec +++ b/speexdsp.spec @@ -1,26 +1,17 @@ -%define anolis_release .0.1 - Name: speexdsp -Version: 1.2 -%global rc_ver rc3 -Release: 0.13.%{rc_ver}%{anolis_release}%{?dist} +Version: 1.2.1 +Release: 2%{?dist} Summary: A voice compression format (DSP) -Group: System Environment/Libraries License: BSD URL: http://www.speex.org/ -Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz -# a patch to speex (774c87d) was done usptream to fix this issue but it seems it -# hasn't been replicated in speexdsp. Issue seen in at least pjproject -# upstream ML thread http://lists.xiph.org/pipermail/speex-dev/2014-May/008488.html -Patch0: speexdsp-fixbuilds-774c87d.patch +Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}.tar.gz -BuildRequires: libtool autoconf automake +BuildRequires: gcc +BuildRequires: make # speexdsp was split from speex in 1.2rc2. As speexdsp does not depend on # speex, a versioned conflict is required. -Conflicts: speex <= 1.2-0.21.rc1 - -Requires: glibc +Conflicts: speex <= 1.2-0.21.rc1 %description Speex is a patent-free compression format designed especially for @@ -33,11 +24,10 @@ This is the DSP package, see the speex package for the codec part. %package devel Summary: Development package for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} # speexdsp was split from speex in 1.2rc2. As speexdsp does not depend on # speex, a versioned conflict is required. -Conflicts: speex-devel <= 1.2-0.21.rc1 +Conflicts: speex-devel <= 1.2-0.21.rc1 %description devel Speex is a patent-free compression format designed especially for @@ -45,53 +35,72 @@ speech. This package contains development files for %{name} This is the DSP package, see the speex package for the codec part. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Doc pages for %{name}. %prep -%setup -q -n %{name}-%{version}%{rc_ver} -%patch0 -p1 -b .inc +%autosetup -p1 %build -autoreconf -vif %configure \ %ifarch aarch64 --disable-neon \ %endif --disable-static -make %{?_smp_mflags} V=1 +%make_build %install -make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install +%make_install # Remove libtool archives find %{buildroot} -type f -name "*.la" -delete -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%{_libdir}/libspeexdsp.so.* +%license COPYING +%doc AUTHORS TODO ChangeLog README NEWS doc/manual.pdf +%doc %{_docdir}/speexdsp/manual.pdf +%{_libdir}/libspeexdsp.so.1* %files devel -%{_includedir}/speex +%{_includedir}/speex/ %{_libdir}/pkgconfig/speexdsp.pc %{_libdir}/libspeexdsp.so -%files doc -%doc AUTHORS COPYING TODO ChangeLog README NEWS doc/manual.pdf -%doc %{_docdir}/speexdsp/manual.pdf - %changelog -* Mon Jul 18 2022 Xiaoping Liu - 1.2-0.13.rc3.0.1 -- Add doc sub package +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 07 2022 David King - 1.2.1-1 +- Update to 1.2.1 (#2098129) + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jun 11 2020 David King - 1.2.0-1 +- Update to 1.2.0 + +* Fri Jan 31 2020 Fedora Release Engineering - 1.2-0.17.rc3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 1.2-0.16.rc3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.2-0.15.rc3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2-0.14.rc3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Fri Feb 09 2018 Fedora Release Engineering - 1.2-0.13.rc3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild