From e27bed50c070917854cea07ef693885dd8a86708 Mon Sep 17 00:00:00 2001 From: W. Michael Petullo Date: Oct 16 2019 22:41:37 +0000 Subject: Import latest after unretiring package Signed-off-by: W. Michael Petullo --- diff --git a/sphinxbase.spec b/sphinxbase.spec index 5d8efc9..0141adf 100644 --- a/sphinxbase.spec +++ b/sphinxbase.spec @@ -1,11 +1,14 @@ +%global extraver prealpha + Name: sphinxbase -Version: 5prealpha -Release: 5%{?dist} +Version: 5 +Release: 0.1.%{extraver}%{?dist} +Epoch: 1 Summary: Common library for CMU Sphinx voice recognition products License: BSD URL: http://cmusphinx.sourceforge.net/ -Source0: http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}%{extraver}.tar.gz BuildRequires: autoconf-archive BuildRequires: bison @@ -31,7 +34,7 @@ This package does not provide voice recognition by itself. %package devel Summary: Header and other development files for sphinxbase -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pkgconfig(libpulse) Provides: bundled(jquery) @@ -47,13 +50,13 @@ The libraries for sphinxbase. %package -n python3-sphinxbase %{?python_provide:%python_provide python3-sphinxbase} Summary: Python interface to sphinxbase -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description -n python3-sphinxbase Python 3 interface to sphinxbase. %prep -%setup -q +%setup -q -n sphinxbase-%{version}%{extraver} # Use openblas instead of the blas reference implementation sed -ri 's/blas|lapack/openblas/' configure.ac @@ -81,6 +84,7 @@ done %build export CPPFLAGS="-I %{_includedir}/openblas" +export PYTHON="python3" %configure --disable-static --with-python=%{__python3} # Get rid of undesirable hardcoded rpaths; workaround libtool reordering @@ -111,17 +115,16 @@ perl args2man.pl ../src/sphinx_adtools/sphinx_pitch < sphinx_pitch.1.in > sphinx %install # Install the binaries and libraries mkdir -p %{buildroot}%{python_sitearch} -make install DESTDIR=%{buildroot} +%make_install # Install the man pages mkdir -p %{buildroot}%{_mandir}/man1 cp -p doc/*.1 %{buildroot}%{_mandir}/man1 # Remove libtool archives +rm -f %{buildroot}%{python3_sitearch}/sphinxbase/*.la rm -f %{buildroot}%{_libdir}/*.la -%ldconfig_scriptlets libs - %files %{_bindir}/* %{_mandir}/man1/* @@ -137,13 +140,23 @@ rm -f %{buildroot}%{_libdir}/*.la %files libs %doc AUTHORS NEWS README %license LICENSE -%{_libdir}/libsphinxad.so.* -%{_libdir}/libsphinxbase.so.* +%{_libdir}/libsphinxad.so.3* +%{_libdir}/libsphinxbase.so.3* %files -n python3-sphinxbase -%{python3_sitearch}/* +%{python3_sitearch}/sphinxbase %changelog +* Sun Oct 13 2019 W. Michael Petullo - 1:5-0.1.prealpha +- More work to switch to Python 3 +- Use %%make_install +- Remove %%ldconfig_scriptlets +- More specific glob in %%{python3_sitearch} +- Move prealpha and make use of epoch +- Use epoch in requires +- Remove remaining .la file +- More specific globbing of libraries + * Sun Feb 03 2019 Fedora Release Engineering - 5prealpha-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild