From 5b72891aa83124c959061ed537e459e3516c4cd3 Mon Sep 17 00:00:00 2001 From: Rusty Lynch Date: Thu, 13 Sep 2012 15:28:56 -0700 Subject: [PATCH] Fixing packaging --- packaging/festival.changes | 3 +++ packaging/festival.spec | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packaging/festival.changes b/packaging/festival.changes index 551db9d..4e04dc6 100644 --- a/packaging/festival.changes +++ b/packaging/festival.changes @@ -1,3 +1,6 @@ +* Thu Sep 13 2012 Rusty Lynch submit/trunk/20120831.221731@269e4ea +- Fix the spec so it correctly builds + * Fri Aug 31 21:11:28 UTC 2012 - jimmy.huang@intel.com - Initial import to Tizen. diff --git a/packaging/festival.spec b/packaging/festival.spec index 09a1a08..ecea33e 100644 --- a/packaging/festival.spec +++ b/packaging/festival.spec @@ -41,7 +41,8 @@ Requires: %{name} = %{version} Files needed for developing software that uses Festival. %prep -%setup -q -b 1 -b 2 -b 3 -b 4 +%setup -q -b 1 -b 2 -b 3 -b 4 +mv ../festival/lib/* lib/ %patch0 -p1 %patch1 -p1 %patch2 @@ -69,7 +70,7 @@ cd ../speech_tools --datadir=%_datadir/festival \ --sysconfdir=%_sysconfdir make CC="gcc -fPIC $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" -cd ../festival +cd ../%{name}-%{version} make CC="gcc -fPIC $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" make doc @@ -77,7 +78,7 @@ make doc %make_install cd ../speech_tools %make_install -cd ../festival +cd ../%{name}-%{version} # install binarys install -D bin/text2wave $RPM_BUILD_ROOT%_bindir/text2wave install -m 755 bin/festival* $RPM_BUILD_ROOT%_bindir/ -- 2.7.4