Fixing packaging

diff --git a/packaging/festival.changes b/packaging/festival.changes
index 551db9d..4e04dc6 100644 (file)
--- a/packaging/festival.changes
+++ b/packaging/festival.changes
@@ -1,3 +1,6 @@
+* Thu Sep 13 2012 Rusty Lynch <rusty.lynch@intel.com> 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 (file)
--- 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/