Request 5256 (accepted)

Overview

Request 5256 (accepted)

Update to 3.3

Created by Aloysius over 3 years ago
In state accepted
Package maintainers: Aloysius and mantre

Submit mbrola

Submit package home:Aloysius:branches:Extra / mbrola to package Extra / mbrola

mbrola.changes Added

@@ -0,0 +1,29 @@
+-------------------------------------------------------------------
+Wed Oct 14 10:18:24 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 3.3 and txt2pho to version 0.96
+ (no changelog supplied)
+- Add txt2phorc as source (no longer supplied upstream)
+- Spec cleanup
+
+-------------------------------------------------------------------
+Thu Jul 4 00:00:00 UTC 2019 - Bernhard M. Wiedemann <bernhard+packman lsmod de>
+
+- build from source
+- do not use dropped recode in 'say' script
+
+-------------------------------------------------------------------
+Mon Aug 29 00:00:00 UTC 2016 - Bernhard M. Wiedemann <bernhard+packman lsmod de>
+
+- Require sox for "play" tool used in say script (boo#995740)
+
+-------------------------------------------------------------------
+Sat Sep 5 00:00:00 UTC 2009 - Manfred.Tremmel@iiv.de
+
+- cleanups where rpmlint wasn't so happy
+
+-------------------------------------------------------------------
+Tue Nov 1 00:00:00 UTC 2005 - Manfred.Tremmel@iiv.de
+
+- first release
+

mbrola.spec Changed

@@ -1,28 +1,38 @@
-# Packmangroup: Other
-# Packmanpackagename: mbrola
-# Packman : Manfred Tremmel
-# Packmanpackagedesc: Speech Synthesis System. For german speech output install one or more of the mbrola-de packages.
-# Packmanpackagedesc_de: Sprachsynthese System. F&uuml;r deutsche Sprachausgabe installieren Sie eines oder mehrere der mbrola-de Pakete.Zur Einbindung in die KDE-Sprachausgabe, installieren Sie mbrola und mindestens eines der mbrola-de Pakete, starten Sie KMouth (Dienstprogramme -&gt; Desktop -&gt; KMouth). In KMouth im Men&uuml; Einstellungen -&gt; KMouth einrichten ..., den KTTSD-Sprachdienst ausw&auml;hlen und in den Karteireiter Sprecher wechseln. F&uuml;gen Sie einen neuen Sprecher hinzu, w&auml;hlen Sie bei Sprache Deutsch und bei Synthesizer Hadifix, KMouth sollte alle Einstellungen automatisch finden k&ouml;nnen. Per Bearbeiten kann die Stimmdatei ge&auml;ndert werden. Im Karteireiter Allgemein kann jetzt die Sprachausgabe aktiviert werden.
+#
+# spec file for package mbrola
+#
+# Copyright (c) 2020 Packman Team <packman@links2linux.de>
+# Copyright (c) 2016-2019 Bernhard M. Wiedemann <bernhard+packman@lsmod.de>
+# Copyright (c) 2005-2009 Manfred Tremmel <Manfred.Tremmel@iiv.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
+#
+
+
+%define tver 0.96
+Name: mbrola
+Version: 3.3
+Release: 0
 Summary: Speech Synthesis System
 Summary(de): Sprachsynthese System
-Name: mbrola
-Version: 302b
-Release: 1
-License: see readme.txt
+License: AGPL-3.0-or-later
 Group: Productivity/Text/Convertors
 URL: https://github.com/numediart/MBROLA
-
-Source0: mbrola.tar
-Source2: txt2pho.zip
+Source0: https://github.com/numediart/MBROLA/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source2: https://github.com/GHPS/txt2pho/archive/%{tver}.tar.gz#/txt2pho-%{tver}.tar.gz
 Source3: say
-
-Vendor: Packman
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: glibc-devel
-BuildRequires: gcc
+Source4: txt2phorc
+BuildRequires: fdupes
 BuildRequires: gcc-c++
-BuildRequires: unzip
 Requires: sox
 Recommends: mbrola-de6
 
@@ -36,51 +46,43 @@
 mbrola-de Pakete.
 
 %prep
-%setup -n MBROLA -a 0 -a 2
+%setup -q -n MBROLA-%{version} -a 0 -a 2
+mkdir txt2pho-%{tver}/lib txt2pho-%{tver}/obj
 
 %build
-make
+export CFLAGS="%{optflags}"
+%make_build
+pushd txt2pho-%{tver}
+%make_build CFLAGS="%{optflags}"
+popd
 
 %install
-%{__mkdir_p} ${RPM_BUILD_ROOT}/etc
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/mbrola
-%{__install} -m 755 ./Bin/mbrola ${RPM_BUILD_ROOT}%{_bindir}/mbrola
-
-cat txt2pho/txt2phorc | sed -e "s/\/home\/tpo\/txt2pho\/data\//\/usr\/share\/mbrola\/data\//g" > ${RPM_BUILD_ROOT}/etc/txt2pho
-cd txt2pho
-%{__install} -m 755 txt2pho ${RPM_BUILD_ROOT}%{_bindir}/
-mv data ${RPM_BUILD_ROOT}%{_datadir}/mbrola/
-cd pipefilt
-g++ ${RPM_OPT_FLAGS} pipefilt.cc -o pipefilt
-%{__install} -m 755 pipefilt ${RPM_BUILD_ROOT}%{_bindir}/
-cd ../preproc/
-%{__make}
-%{__install} -m 755 preproc ${RPM_BUILD_ROOT}%{_bindir}/
-%{__install} -m 644 Rules.lst ${RPM_BUILD_ROOT}%{_datadir}/mbrola/
-%{__install} -m 644 Hadifix.abk ${RPM_BUILD_ROOT}%{_datadir}/mbrola/
-%{__install} -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/
+mkdir -p %{buildroot}%{_sysconfdir}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/mbrola
+install -m 755 ./Bin/mbrola %{buildroot}%{_bindir}/mbrola
 
-%clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
+pushd txt2pho-%{tver}
+install -m 755 txt2pho %{buildroot}%{_bindir}/
+cp -r data %{buildroot}%{_datadir}/mbrola/
+install -m 755 pipefilt %{buildroot}%{_bindir}/
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/txt2pho
+install -m 755 preproc %{buildroot}%{_bindir}/
+install -m 644 data/PPRules/rules.lst %{buildroot}%{_datadir}/mbrola/
+install -m 644 data/hadifix.abk %{buildroot}%{_datadir}/mbrola/
+popd
+install -m 755 %{SOURCE3} %{buildroot}%{_bindir}/
+%fdupes %{buildroot}%{_datadir}/%{name}
 
 %files
-%defattr(-, root, root)
 %doc README.md
 %license LICENSE
-%config(noreplace) /etc/txt2pho
-%{_bindir}/*
-%dir %{_datadir}/mbrola
-%dir %{_datadir}/mbrola/data
-%{_datadir}/mbrola/*
+%config(noreplace) %{_sysconfdir}/txt2pho
+%{_bindir}/mbrola
+%{_bindir}/pipefilt
+%{_bindir}/preproc
+%{_bindir}/say
+%{_bindir}/txt2pho
+%{_datadir}/%{name}
 
 %changelog
-* Thu Jul 04 2019 Bernhard M. Wiedemann <bernhard+packman lsmod de>
-- build from source
-- do not use dropped recode in 'say' script
-* Mon Aug 29 2016 Bernhard M. Wiedemann <bernhard+packman lsmod de>
-- Require sox for "play" tool used in say script (boo#995740)
-* Sat Sep 05 2009 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 301h-1.pm.1
-- cleanups where rpmlint wasn't so happy
-* Tue Nov 01 2005 Manfred Tremmel <Manfred.Tremmel@iiv.de>
-- first release