From 678b7e59b0a980cd47ce4dbb341a3cb43f0c1144 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 3 Sep 2014 16:02:53 -0400 Subject: [PATCH] fix DESTDIR patch so that mkfa and mkdfa.pl get installed --- julius-4.2.2-DESTDIR.patch | 99 +++++++++++++++++++++----------------- julius.spec | 8 ++- 2 files changed, 63 insertions(+), 44 deletions(-) diff --git a/julius-4.2.2-DESTDIR.patch b/julius-4.2.2-DESTDIR.patch index 9ef1298..9ffd29d 100644 --- a/julius-4.2.2-DESTDIR.patch +++ b/julius-4.2.2-DESTDIR.patch @@ -1,6 +1,6 @@ diff -up julius-4.2.2/adinrec/Makefile.in.DESTDIR julius-4.2.2/adinrec/Makefile.in ---- julius-4.2.2/adinrec/Makefile.in.DESTDIR 2012-08-13 13:13:41.986343204 -0400 -+++ julius-4.2.2/adinrec/Makefile.in 2012-08-13 13:13:55.378342724 -0400 +--- julius-4.2.2/adinrec/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/adinrec/Makefile.in 2014-09-03 15:59:11.562922371 -0400 @@ -36,8 +36,8 @@ $(TARGET): adinrec.c $(LIBSENT)/libsent. install: install.bin @@ -13,8 +13,8 @@ diff -up julius-4.2.2/adinrec/Makefile.in.DESTDIR julius-4.2.2/adinrec/Makefile. ############################################################ diff -up julius-4.2.2/adintool/Makefile.in.DESTDIR julius-4.2.2/adintool/Makefile.in ---- julius-4.2.2/adintool/Makefile.in.DESTDIR 2012-08-13 13:14:02.713342463 -0400 -+++ julius-4.2.2/adintool/Makefile.in 2012-08-13 13:14:11.552342146 -0400 +--- julius-4.2.2/adintool/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/adintool/Makefile.in 2014-09-03 15:59:11.562922371 -0400 @@ -36,8 +36,8 @@ $(TARGET): adintool.c $(LIBSENT)/libsent install: install.bin @@ -27,8 +27,8 @@ diff -up julius-4.2.2/adintool/Makefile.in.DESTDIR julius-4.2.2/adintool/Makefil ############################################################ diff -up julius-4.2.2/generate-ngram/Makefile.in.DESTDIR julius-4.2.2/generate-ngram/Makefile.in ---- julius-4.2.2/generate-ngram/Makefile.in.DESTDIR 2012-08-13 13:15:45.119338806 -0400 -+++ julius-4.2.2/generate-ngram/Makefile.in 2012-08-13 13:15:58.838338311 -0400 +--- julius-4.2.2/generate-ngram/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/generate-ngram/Makefile.in 2014-09-03 15:59:11.562922371 -0400 @@ -33,8 +33,8 @@ $(TARGET): $(OBJ) $(LIBSENT)/libsent.a install: install.bin @@ -41,8 +41,8 @@ diff -up julius-4.2.2/generate-ngram/Makefile.in.DESTDIR julius-4.2.2/generate-n clean: $(RM) $(OBJ) *~ core diff -up julius-4.2.2/gramtools/accept_check/Makefile.in.DESTDIR julius-4.2.2/gramtools/accept_check/Makefile.in ---- julius-4.2.2/gramtools/accept_check/Makefile.in.DESTDIR 2012-08-13 13:18:34.345332753 -0400 -+++ julius-4.2.2/gramtools/accept_check/Makefile.in 2012-08-13 13:18:52.255332113 -0400 +--- julius-4.2.2/gramtools/accept_check/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/gramtools/accept_check/Makefile.in 2014-09-03 15:59:11.562922371 -0400 @@ -36,8 +36,8 @@ $(TARGET): $(OBJ) install: install.bin @@ -55,8 +55,8 @@ diff -up julius-4.2.2/gramtools/accept_check/Makefile.in.DESTDIR julius-4.2.2/gr ############################################################ diff -up julius-4.2.2/gramtools/dfa_determinize/Makefile.in.DESTDIR julius-4.2.2/gramtools/dfa_determinize/Makefile.in ---- julius-4.2.2/gramtools/dfa_determinize/Makefile.in.DESTDIR 2012-08-13 13:19:54.860329875 -0400 -+++ julius-4.2.2/gramtools/dfa_determinize/Makefile.in 2012-08-13 13:20:07.328329430 -0400 +--- julius-4.2.2/gramtools/dfa_determinize/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/gramtools/dfa_determinize/Makefile.in 2014-09-03 15:59:11.562922371 -0400 @@ -35,8 +35,8 @@ $(TARGET): $(OBJ) install: install.bin @@ -69,8 +69,8 @@ diff -up julius-4.2.2/gramtools/dfa_determinize/Makefile.in.DESTDIR julius-4.2.2 ############################################################ diff -up julius-4.2.2/gramtools/dfa_minimize/Makefile.in.DESTDIR julius-4.2.2/gramtools/dfa_minimize/Makefile.in ---- julius-4.2.2/gramtools/dfa_minimize/Makefile.in.DESTDIR 2012-08-13 13:17:56.410334110 -0400 -+++ julius-4.2.2/gramtools/dfa_minimize/Makefile.in 2012-08-13 13:18:09.214333651 -0400 +--- julius-4.2.2/gramtools/dfa_minimize/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/gramtools/dfa_minimize/Makefile.in 2014-09-03 15:59:11.562922371 -0400 @@ -34,8 +34,8 @@ $(TARGET): $(OBJ) install: install.bin @@ -83,8 +83,8 @@ diff -up julius-4.2.2/gramtools/dfa_minimize/Makefile.in.DESTDIR julius-4.2.2/gr ############################################################ diff -up julius-4.2.2/gramtools/generate/Makefile.in.DESTDIR julius-4.2.2/gramtools/generate/Makefile.in ---- julius-4.2.2/gramtools/generate/Makefile.in.DESTDIR 2012-08-13 13:18:16.196333402 -0400 -+++ julius-4.2.2/gramtools/generate/Makefile.in 2012-08-13 13:18:27.686332991 -0400 +--- julius-4.2.2/gramtools/generate/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/gramtools/generate/Makefile.in 2014-09-03 15:59:11.563922366 -0400 @@ -35,8 +35,8 @@ $(TARGET): $(OBJ) install: install.bin @@ -97,8 +97,8 @@ diff -up julius-4.2.2/gramtools/generate/Makefile.in.DESTDIR julius-4.2.2/gramto ############################################################ diff -up julius-4.2.2/gramtools/gram2sapixml/Makefile.in.DESTDIR julius-4.2.2/gramtools/gram2sapixml/Makefile.in ---- julius-4.2.2/gramtools/gram2sapixml/Makefile.in.DESTDIR 2012-08-13 13:19:37.367330501 -0400 -+++ julius-4.2.2/gramtools/gram2sapixml/Makefile.in 2012-08-13 13:19:47.339330144 -0400 +--- julius-4.2.2/gramtools/gram2sapixml/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/gramtools/gram2sapixml/Makefile.in 2014-09-03 15:59:11.563922366 -0400 @@ -17,8 +17,8 @@ all: install: install.bin @@ -110,10 +110,9 @@ diff -up julius-4.2.2/gramtools/gram2sapixml/Makefile.in.DESTDIR julius-4.2.2/gr clean: echo nothing to do -diff -up julius-4.2.2/gramtools/Makefile.in.DESTDIR julius-4.2.2/gramtools/Makefile.in diff -up julius-4.2.2/gramtools/mkdfa/Makefile.in.DESTDIR julius-4.2.2/gramtools/mkdfa/Makefile.in ---- julius-4.2.2/gramtools/mkdfa/Makefile.in.DESTDIR 2012-08-13 13:17:28.637335102 -0400 -+++ julius-4.2.2/gramtools/mkdfa/Makefile.in 2012-08-13 13:17:46.600334459 -0400 +--- julius-4.2.2/gramtools/mkdfa/Makefile.in.DESTDIR 2012-07-27 04:44:48.000000000 -0400 ++++ julius-4.2.2/gramtools/mkdfa/Makefile.in 2014-09-03 15:59:11.563922366 -0400 @@ -18,13 +18,13 @@ all: install: @@ -132,9 +131,23 @@ diff -up julius-4.2.2/gramtools/mkdfa/Makefile.in.DESTDIR julius-4.2.2/gramtools clean: (cd $(SUBDIR); $(MAKE) clean) +diff -up julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in.DESTDIR julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in +--- julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in.DESTDIR 2014-09-03 15:59:17.351892716 -0400 ++++ julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in 2014-09-03 15:59:32.005817646 -0400 +@@ -43,8 +43,8 @@ $(TARGET): $(OBJS) + install: install.bin + + install.bin: +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + $(RM) *.o *~ core diff -up julius-4.2.2/gramtools/nextword/Makefile.in.DESTDIR julius-4.2.2/gramtools/nextword/Makefile.in ---- julius-4.2.2/gramtools/nextword/Makefile.in.DESTDIR 2012-08-13 13:18:59.540331853 -0400 -+++ julius-4.2.2/gramtools/nextword/Makefile.in 2012-08-13 13:19:11.613331420 -0400 +--- julius-4.2.2/gramtools/nextword/Makefile.in.DESTDIR 2012-07-27 04:44:49.000000000 -0400 ++++ julius-4.2.2/gramtools/nextword/Makefile.in 2014-09-03 15:59:11.563922366 -0400 @@ -36,8 +36,8 @@ $(TARGET): $(OBJ) install: install.bin @@ -147,8 +160,8 @@ diff -up julius-4.2.2/gramtools/nextword/Makefile.in.DESTDIR julius-4.2.2/gramto ############################################################ diff -up julius-4.2.2/gramtools/yomi2voca/Makefile.in.DESTDIR julius-4.2.2/gramtools/yomi2voca/Makefile.in ---- julius-4.2.2/gramtools/yomi2voca/Makefile.in.DESTDIR 2012-08-13 13:19:19.833331127 -0400 -+++ julius-4.2.2/gramtools/yomi2voca/Makefile.in 2012-08-13 13:19:30.178330757 -0400 +--- julius-4.2.2/gramtools/yomi2voca/Makefile.in.DESTDIR 2012-07-27 04:44:49.000000000 -0400 ++++ julius-4.2.2/gramtools/yomi2voca/Makefile.in 2014-09-03 15:59:11.563922366 -0400 @@ -17,8 +17,8 @@ all: install: install.bin @@ -161,8 +174,8 @@ diff -up julius-4.2.2/gramtools/yomi2voca/Makefile.in.DESTDIR julius-4.2.2/gramt clean: echo nothing to do diff -up julius-4.2.2/jclient-perl/Makefile.in.DESTDIR julius-4.2.2/jclient-perl/Makefile.in ---- julius-4.2.2/jclient-perl/Makefile.in.DESTDIR 2012-08-13 13:16:09.779337920 -0400 -+++ julius-4.2.2/jclient-perl/Makefile.in 2012-08-13 13:16:17.950337629 -0400 +--- julius-4.2.2/jclient-perl/Makefile.in.DESTDIR 2012-07-27 04:44:49.000000000 -0400 ++++ julius-4.2.2/jclient-perl/Makefile.in 2014-09-03 15:59:11.563922366 -0400 @@ -17,8 +17,8 @@ all: install: install.bin @@ -175,8 +188,8 @@ diff -up julius-4.2.2/jclient-perl/Makefile.in.DESTDIR julius-4.2.2/jclient-perl clean: echo nothing to do diff -up julius-4.2.2/jcontrol/Makefile.in.DESTDIR julius-4.2.2/jcontrol/Makefile.in ---- julius-4.2.2/jcontrol/Makefile.in.DESTDIR 2012-08-13 13:15:10.583340037 -0400 -+++ julius-4.2.2/jcontrol/Makefile.in 2012-08-13 13:15:21.849339634 -0400 +--- julius-4.2.2/jcontrol/Makefile.in.DESTDIR 2012-07-27 04:44:49.000000000 -0400 ++++ julius-4.2.2/jcontrol/Makefile.in 2014-09-03 15:59:11.564922361 -0400 @@ -31,8 +31,8 @@ $(TARGET): $(OBJ) install: install.bin @@ -189,8 +202,8 @@ diff -up julius-4.2.2/jcontrol/Makefile.in.DESTDIR julius-4.2.2/jcontrol/Makefil clean: $(RM) $(OBJ) diff -up julius-4.2.2/julius/Makefile.in.DESTDIR julius-4.2.2/julius/Makefile.in ---- julius-4.2.2/julius/Makefile.in.DESTDIR 2012-08-13 13:12:32.007345705 -0400 -+++ julius-4.2.2/julius/Makefile.in 2012-08-13 13:12:45.407345225 -0400 +--- julius-4.2.2/julius/Makefile.in.DESTDIR 2012-07-27 04:44:49.000000000 -0400 ++++ julius-4.2.2/julius/Makefile.in 2014-09-03 15:59:11.564922361 -0400 @@ -61,8 +61,8 @@ $(TARGET): $(LIBSENT)/libsent.a $(LIBJUL install: install.bin @@ -203,8 +216,8 @@ diff -up julius-4.2.2/julius/Makefile.in.DESTDIR julius-4.2.2/julius/Makefile.in depend: makedepend -- $(CFLAGS) -- $(OBJSENT) diff -up julius-4.2.2/libjulius/Makefile.in.DESTDIR julius-4.2.2/libjulius/Makefile.in ---- julius-4.2.2/libjulius/Makefile.in.DESTDIR 2012-08-13 13:11:41.927347496 -0400 -+++ julius-4.2.2/libjulius/Makefile.in 2012-08-13 13:12:07.924346565 -0400 +--- julius-4.2.2/libjulius/Makefile.in.DESTDIR 2012-07-27 04:44:49.000000000 -0400 ++++ julius-4.2.2/libjulius/Makefile.in 2014-09-03 15:59:11.564922361 -0400 @@ -90,16 +90,16 @@ $(TARGET): $(OBJ) install: install.lib install.include install.bin @@ -229,8 +242,8 @@ diff -up julius-4.2.2/libjulius/Makefile.in.DESTDIR julius-4.2.2/libjulius/Makef depend: makedepend -- $(CFLAGS) -- $(OBJSENT) diff -up julius-4.2.2/libsent/Makefile.in.DESTDIR julius-4.2.2/libsent/Makefile.in ---- julius-4.2.2/libsent/Makefile.in.DESTDIR 2012-08-13 13:10:55.572349152 -0400 -+++ julius-4.2.2/libsent/Makefile.in 2012-08-13 13:11:28.571347973 -0400 +--- julius-4.2.2/libsent/Makefile.in.DESTDIR 2012-07-27 04:44:50.000000000 -0400 ++++ julius-4.2.2/libsent/Makefile.in 2014-09-03 15:59:11.564922361 -0400 @@ -144,16 +144,16 @@ $(TARGET): $(OBJ) install: install.lib install.include install.bin @@ -255,8 +268,8 @@ diff -up julius-4.2.2/libsent/Makefile.in.DESTDIR julius-4.2.2/libsent/Makefile. clean: $(RM) *~ src/*/*~ src/*/*.o src/*/*/*.o src/*/*/*/*.o src/*/*/*/*/*.o include/sent/*~ diff -up julius-4.2.2/man/Makefile.in.DESTDIR julius-4.2.2/man/Makefile.in ---- julius-4.2.2/man/Makefile.in.DESTDIR 2012-08-13 13:16:39.154336871 -0400 -+++ julius-4.2.2/man/Makefile.in 2012-08-13 13:16:58.414336182 -0400 +--- julius-4.2.2/man/Makefile.in.DESTDIR 2012-07-27 04:44:57.000000000 -0400 ++++ julius-4.2.2/man/Makefile.in 2014-09-03 15:59:11.564922361 -0400 @@ -19,16 +19,16 @@ all: install: install.man install.man.ja @@ -279,8 +292,8 @@ diff -up julius-4.2.2/man/Makefile.in.DESTDIR julius-4.2.2/man/Makefile.in cd .. diff -up julius-4.2.2/mkbingram/Makefile.in.DESTDIR julius-4.2.2/mkbingram/Makefile.in ---- julius-4.2.2/mkbingram/Makefile.in.DESTDIR 2012-08-13 13:12:55.460344867 -0400 -+++ julius-4.2.2/mkbingram/Makefile.in 2012-08-13 13:13:08.584344398 -0400 +--- julius-4.2.2/mkbingram/Makefile.in.DESTDIR 2012-07-27 04:44:57.000000000 -0400 ++++ julius-4.2.2/mkbingram/Makefile.in 2014-09-03 15:59:11.564922361 -0400 @@ -32,8 +32,8 @@ $(TARGET): $(OBJ) $(LIBSENT)/libsent.a install: install.bin @@ -293,8 +306,8 @@ diff -up julius-4.2.2/mkbingram/Makefile.in.DESTDIR julius-4.2.2/mkbingram/Makef clean: $(RM) $(OBJ) diff -up julius-4.2.2/mkbinhmm/Makefile.in.DESTDIR julius-4.2.2/mkbinhmm/Makefile.in ---- julius-4.2.2/mkbinhmm/Makefile.in.DESTDIR 2012-08-13 13:13:19.525344007 -0400 -+++ julius-4.2.2/mkbinhmm/Makefile.in 2012-08-13 13:13:34.055343487 -0400 +--- julius-4.2.2/mkbinhmm/Makefile.in.DESTDIR 2012-07-27 04:44:57.000000000 -0400 ++++ julius-4.2.2/mkbinhmm/Makefile.in 2014-09-03 15:59:11.565922356 -0400 @@ -32,8 +32,8 @@ mkbinhmmlist@EXEEXT@: mkbinhmmlist.o $(L install: install.bin @@ -307,8 +320,8 @@ diff -up julius-4.2.2/mkbinhmm/Makefile.in.DESTDIR julius-4.2.2/mkbinhmm/Makefil clean: $(RM) mkbinhmm.o mkbinhmmlist.o diff -up julius-4.2.2/mkgshmm/Makefile.in.DESTDIR julius-4.2.2/mkgshmm/Makefile.in ---- julius-4.2.2/mkgshmm/Makefile.in.DESTDIR 2012-08-13 13:14:19.842341851 -0400 -+++ julius-4.2.2/mkgshmm/Makefile.in 2012-08-13 13:14:36.130341270 -0400 +--- julius-4.2.2/mkgshmm/Makefile.in.DESTDIR 2012-07-27 04:44:57.000000000 -0400 ++++ julius-4.2.2/mkgshmm/Makefile.in 2014-09-03 15:59:11.565922356 -0400 @@ -23,8 +23,8 @@ $(TARGET): install: install.bin @@ -321,8 +334,8 @@ diff -up julius-4.2.2/mkgshmm/Makefile.in.DESTDIR julius-4.2.2/mkgshmm/Makefile. ############################################################ diff -up julius-4.2.2/mkss/Makefile.in.DESTDIR julius-4.2.2/mkss/Makefile.in ---- julius-4.2.2/mkss/Makefile.in.DESTDIR 2012-08-13 13:14:42.697341034 -0400 -+++ julius-4.2.2/mkss/Makefile.in 2012-08-13 13:15:01.406340364 -0400 +--- julius-4.2.2/mkss/Makefile.in.DESTDIR 2012-07-27 04:44:57.000000000 -0400 ++++ julius-4.2.2/mkss/Makefile.in 2014-09-03 15:59:11.565922356 -0400 @@ -36,8 +36,8 @@ $(TARGET): mkss.c $(LIBSENT)/libsent.a $ install: install.bin diff --git a/julius.spec b/julius.spec index 5ad7df1..479eb5e 100644 --- a/julius.spec +++ b/julius.spec @@ -1,6 +1,6 @@ Name: julius Version: 4.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Large vocabulary continuous speech recognition (LVCSR) decoder software License: Julius URL: http://julius.sourceforge.jp/ @@ -9,6 +9,7 @@ Source1: http://julius.sourceforge.jp/archive/japanese-models.tar.gz Patch0: julius-4.2.2-DESTDIR.patch Patch1: julius-4.2.2-sharedlibs.patch BuildRequires: perl(Jcode), alsa-lib-devel, libsndfile-devel, pulseaudio-libs-devel, zlib-devel, readline-devel +BuildRequires: bison, flex, nkf # Requires: %description @@ -81,6 +82,8 @@ cp -a japanese-models/ %{buildroot}%{_datadir}/julius/ %{_bindir}/mkbingram %{_bindir}/mkbinhmm %{_bindir}/mkbinhmmlist +%{_bindir}/mkdfa.pl +%{_bindir}/mkfa %{_bindir}/mkgshmm %{_bindir}/mkss %{_bindir}/nextword @@ -104,6 +107,9 @@ cp -a japanese-models/ %{buildroot}%{_datadir}/julius/ %{_datadir}/julius/japanese-models/ %changelog +* Wed Sep 3 2014 Tom Callaway - 4.2.2-7 +- fix DESTDIR patch so that mkfa and mkdfa.pl get installed + * Sat Aug 16 2014 Fedora Release Engineering - 4.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild