From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 18 Sep 2020 17:35:16 +0000 (+0200)
Subject: - updated to 2.2
X-Git-Tag: auto/th/flite-2.2-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fflite.git;a=commitdiff_plain;h=0777c0d478179e92bb374cd56189b69989ac825b

- updated to 2.2
- updated link patch
- removed obsolete texinfo5 patch
---

diff --git a/flite-link.patch b/flite-link.patch
index b84b2a1..da3ca18 100644
--- a/flite-link.patch
+++ b/flite-link.patch
@@ -1,5 +1,5 @@
---- flite-1.4-release/config/common_make_rules.orig	2012-10-06 19:43:00.376818894 +0200
-+++ flite-1.4-release/config/common_make_rules	2012-10-06 19:47:19.680146823 +0200
+--- flite-2.2/config/common_make_rules.orig	2020-08-13 02:17:09.000000000 +0200
++++ flite-2.2/config/common_make_rules	2020-09-18 18:53:43.009784438 +0200
 @@ -68,8 +68,22 @@
  
  FLITELIBS = $(BUILDDIR)/lib/libflite.a
@@ -24,12 +24,12 @@
  FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
  ifdef SHFLAGS
  SOOBJS = $(OBJS:.o=.os)
-@@ -123,7 +133,7 @@
+@@ -123,7 +137,7 @@
  	@ rm -rf shared_os && mkdir shared_os
  	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
  	@ (cd shared_os && ar x ../$<)
--	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+	(cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -Wl,-rpath-link=../$(dir $@) -L../$(dir $@) -o ../$@.${PROJECT_VERSION} *.os $($(patsubst %.so,%_LDLIBS,$(notdir $@))))
+-	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS))
++	(cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -Wl,-rpath-link=../$(dir $@) -L../$(dir $@) -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS)  $($(patsubst %.so,%_LDLIBS,$(notdir $@))))
  	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
  	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
  	@ rm -rf shared_os
@@ -44,21 +44,23 @@
  
  include $(TOP)/config/common_make_rules
  
---- flite-1.4-release/main/Makefile.orig	2012-10-06 19:43:00.376818894 +0200
-+++ flite-1.4-release/main/Makefile	2012-10-06 19:49:58.660143508 +0200
-@@ -51,9 +51,9 @@
+--- flite-2.2/main/Makefile.orig	2020-08-13 02:17:09.000000000 +0200
++++ flite-2.2/main/Makefile	2020-09-18 19:06:56.732151141 +0200
+@@ -54,10 +54,10 @@
  VOICES=$(VOXES)
  VOICELIBS=$(VOICES:%=flite_%)
  
--flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
-+flite_LIBS = flite $(LEXES:%=flite_%) $(LANGS:%=flite_%) $(VOICELIBS)
+-flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
+-flite_LIBS = $(flite_MODS) flite
++flite_MODS = $(LEXES:%=flite_%) $(LANGS:%=flite_%)  $(VOICELIBS)
++flite_LIBS = flite $(flite_MODS)
  
 -flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
 +flite_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link=$(LIBDIR) $(flite_LIBS:%=-l%)
  flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
  
  include $(TOP)/config/common_make_rules
-@@ -66,7 +66,7 @@
+@@ -74,7 +74,7 @@
                      $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
  
  flite_time_LIBS = flite_cmu_time_awb flite_usenglish flite_cmulex
diff --git a/flite.spec b/flite.spec
index 1ba97e9..af19722 100644
--- a/flite.spec
+++ b/flite.spec
@@ -9,12 +9,13 @@ Summary:	flite - a small, fast speech synthesis engine
 Summary(pl.UTF-8):	flite - mały, szybki silnik syntezy mowy
 Summary(ru.UTF-8):	flite - маленькое, быстрое средство для синтеза речи
 Name:		flite
-Version:	2.1
+Version:	2.2
 Release:	1
 License:	Custom, see COPYING
 Group:		Applications/Sound
-Source0:	http://www.festvox.org/flite/packed/flite-2.1/%{name}-%{version}-release.tar.bz2
-# Source0-md5:	915ac91068fc962f4a0e8aa26164cc8a
+#Source0Download: https://github.com/festvox/flite/releases
+Source0:	https://github.com/festvox/flite/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	31f84ece0078906780f07942c0cd978c
 # ALT Linux patches:
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-fix-readonly-assignments.patch
@@ -23,8 +24,7 @@ Patch2:		%{name}-doc.patch
 Patch3:		%{name}-version.patch
 #
 Patch5:		%{name}-fix-audiodriver-setup.patch
-Patch6:		texinfo5.patch
-URL:		http://cmuflite.org/
+URL:		http://www.festvox.org/flite/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
@@ -89,13 +89,12 @@ Statyczna biblioteka flite - małego, szybkiego silnika syntezy mowy.
 быстрого средства для синтеза речи.
 
 %prep
-%setup -qn %{name}-%{version}-release
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -116,7 +115,7 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
 # omitted in make install
 install bin/t2p $RPM_BUILD_ROOT%{_bindir}
-install debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/texinfo5.patch b/texinfo5.patch
deleted file mode 100644
index 3998367..0000000
--- a/texinfo5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flite-1.4-release/doc/Makefile~	2015-03-05 18:29:30.000000000 +0100
-+++ flite-1.4-release/doc/Makefile	2015-03-05 18:31:22.741901079 +0100
-@@ -50,7 +50,7 @@
- flite.html: flite.texi
- 	@ if [ ! -d html ] ; \
-           then mkdir -p html ; fi
--	(cd html; texi2html -number -split_chapter ../flite.texi)
-+	(cd html; texi2html -number-sections -split_chapter ../flite.texi)
- 	@ if [ -d html/flite ] ; \
- 	  then mv html/flite/*.html html ; \
-                rmdir html/flite; fi