Accepting request 128082 from home:embar-:mbrola-lt

Force to use -stl variant of WxWidgets.

OBS-URL: https://build.opensuse.org/request/show/128082
OBS-URL: https://build.opensuse.org/package/show/Education/espeakedit?expand=0&rev=2

espeakedit.changes

@@ -1,3 +1,7 @@
+-------------------------------------------------------------------
+Wed Jul 11 09:10:07 EEST 2012 - embar@super.lt
+- Fix ability to use wxcontainer instead of stl variant for WxWidgets
+
 -------------------------------------------------------------------
 Sat Jul 07 19:40:40 UTC 2012 - embar@super.lt
 - Version 1.46.02

espeakedit.spec

@@ -28,12 +28,25 @@ Group:          Productivity/Other
 Source:         %{name}-%{version}.zip
 Source1:        espeakedit.1
 Patch0:         makefile_rpmoptflags_wxversion.patch
+#To avoid library choise conflict: recomend to use -stl versions instead of -wxcontainer
+Requires:       libwx_baseu-2_8-0-stl
+Requires:       libwx_baseu-2_8-0-compat-lib-stl
+Requires:       libwx_gtk2u_adv-2_8-0-compat-lib-stl
+Requires:       libwx_gtk2u_core-2_8-0-compat-lib-stl
+Requires:       libwx_gtk2u_html-2_8-0-compat-lib-stl
+Requires:       wxWidgets-compat-lib-config
+Conflicts:      wxWidgets-ansi-compat-lib-config
+Conflicts:      wxWidgets-wxcontainer-compat-lib-config
 BuildRequires:  gcc-c++
 BuildRequires:  portaudio-devel
 BuildRequires:  pulseaudio-devel
 BuildRequires:  unzip
 BuildRequires:  wxWidgets-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+#Fix ability to use wxcontainer instead of stl variant for WxWidgets
+%define _use_internal_dependency_generator 0
+%define __find_requires %wx_requires
+
 
 %description
 eSpeak is a software speech synthesizer for English, and some other languages.
@@ -43,10 +56,6 @@ eSpeakEdit provides a User Interface to edit the eSpeak voices.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-#%patch1 -p1
-# Don't use the included binary voice dictionaries; we compile these from
-# source
-#%{__rm} espeak-data/*_dict
 # Build against portaudio v19 (see ReadMe)
 %{__cp} -f src/portaudio19.h src/portaudio.h
 %ifarch i386 i486 i586 i686
@@ -57,24 +66,14 @@ sed "s/lib64/lib/g" -i src/Makefile
 cd src
 make %{?_smp_mflags} CFLAGS="%{optflags}"
 cd ..
-# Build the TTS voice dictionaries
-export ESPEAK_DATA_PATH=%{_builddir}/%{name}-%{version}
-#cd dictsource
-#for voice in $(../src/speak --voices | awk '{print $2}{print $5}' | egrep -v Language\|File\|/ | uniq); do
-#    ../src/speak --compile=$voice;
-#done
 
 %install
 cd src
 mkdir -p %{buildroot}/%{_bindir}/
 cp espeakedit %{buildroot}/%{_bindir}/
 cd ..
-# Remove static libraries
-#%{__rm} %{buildroot}%{_libdir}/*.a
 # Install manpage
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/espeakedit.1
-# Rename docs subdir for installation with %doc
-%{__mv} docs/ html/
 
 %post -p /sbin/ldconfig