Browse Source

fix BTS:1333

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6764 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 12 years ago
parent
commit
d2da1c3d6c
1 changed files with 12 additions and 11 deletions
  1. 12 11
      T/TiMidity++4ALSA/TiMidity++4ALSA-vl.spec

+ 12 - 11
T/TiMidity++4ALSA/TiMidity++4ALSA-vl.spec

@@ -6,7 +6,7 @@
 
 Name:		TiMidity++4ALSA
 Version:	2.13.2
-Release:	9%{?_dist_release}
+Release:	10%{?_dist_release}
 
 Summary:	A software wavetable MIDI synthesizer(for ALSA)
 Summary(ja):  ソフトウェアMIDI音源シンセサイザー(for ALSA)
@@ -60,26 +60,27 @@ Patch3: TiMidity++_interface.patch
 Patch4: TiMidity++_lib.patch
 Patch5: TiMidity++_timidity.patch
 Patch6: TiMidity++_utils.patch
+Patch10: TiMidity++_tcltk.patch
 
 #--------------------------------------------------------------------
 
 BuildRoot:  %{_tmppath}/%{org_name}-%{version}-root
 
-BuildRequires: arts-devel, esound-devel, alsa-lib-devel, ncurses-devel, gtk2-devel
+BuildRequires: arts-devel, alsa-lib-devel, ncurses-devel, gtk2-devel
 BuildRequires: libao-devel, libvorbis-devel, flac-devel, speex-devel
 ## BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: desktop-file-utils, emacs
 ## for ALSA
 BuildRequires: glibc-kernheaders
 
-BuildPreReq: esound-devel, libogg-devel, libvorbis-devel
-BuildPreReq: Xaw3d-devel, gtk+-devel, tcl, tk
+BuildRequires: libogg-devel, libvorbis-devel
+BuildRequires: Xaw3d-devel, gtk+-devel, tcl, tk
 
-Requires: esound, libvorbis, libogg, XOrg-libs, audiofile
+Requires: libvorbis, libogg, XOrg-libs, audiofile
 Requires: Xaw3d, gtk+, glib, tcl, tk, slang, alsa-utils
 Requires: hicolor-icon-theme
 
-Prereq : soundfont2
+Requires(pre) : soundfont2
 
 ## _Conflicts_ : TiMidity++
 Obsoletes: TiMidity++ <= %{version}
@@ -180,6 +181,7 @@ root
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch10 -p1
 
 %build
 if [ %{debug} = "on" ] ; then
@@ -188,11 +190,7 @@ else
   export CFLAGS="$RPM_OPT_FLAGS"
 fi
 ## SEED 2008-08-18現在で flac オプションでエラーが出る対応
-if [ %{?_dist_release} = "vl5" ] ; then
-  export ENABLE_AUDIO="oss,alsa,arts,esd,ao,vorbis,speex"
-else
-  export ENABLE_AUDIO="oss,alsa,arts,esd,ao,vorbis,speex,flac"
-fi
+export ENABLE_AUDIO="oss,alsa,arts,esd,ao,vorbis,speex"
 
 
 ./configure \
@@ -345,6 +343,9 @@ fi
 %{_prefix}/lib/timidity/*
 #--------------------------------------------------------------------
 %changelog
+* Wed Aug 29 2012 Yoji TOYODA 2.13.2-10
+- rebuild with Vine6 environment
+- add Patch10 (TiMidity++_tcltk.patch)
 
 * Thu Aug 18 2008 Seiichirou Babasaki 2.13.2-9
 - Updated specfile