- unified

[packages/TiMidity++.git] / TiMidity++.spec

diff --git a/TiMidity++.spec b/TiMidity++.spec
index a94ef9908aa79d52559388700042d05a052246e8..f76e7b205ea5b562109834d9f418942e573f4ffe 100644 (file)
--- a/TiMidity++.spec
+++ b/TiMidity++.spec
@@ -15,7 +15,7 @@ Summary(ru):  
 Summary(uk):   ðÒÏÇÒÁ×ÁÞ MIDI-ÆÁÊÌ¦× ÔÁ ËÏÎ×ÅÒÔÏÒ §È × WAV ÆÏÒÍÁÔ
 Name:          TiMidity++
 Version:       2.13.0
-Release:       3
+Release:       5
 License:       GPL
 Vendor:                Masanao Izumo <mo@goice.co.jp>
 Group:         Applications/Sound
@@ -41,7 +41,7 @@ BuildRequires:        ncurses-devel
 BuildRequires: slang-devel
 %{?with_X:BuildRequires:       tk-devel >= 8.3.2}
 %{?with_vorbis:BuildRequires:  libvorbis-devel}
-%{?with_X:Provides:    %{name}(X) = %{version}-%{releaase}}
+%{?with_X:Provides:    %{name}(X) = %{version}-%{release}}
 Obsoletes:     timidity
 Obsoletes:     timidity++
 Obsoletes:     timidity++-X11
@@ -119,7 +119,7 @@ patches no meio musical) para o TiMidity++.
 
 %package gtk
 Summary:       GTK+ interface for TiMidity++
-Summary(pl):   Interfejs TiMidity++ oparty o bibliotekê gtk+
+Summary(pl):   Interfejs TiMidity++ oparty o bibliotekê GTK+
 Group:         Applications/Sound
 Requires:      %{name}(X) = %{version}-%{release}
 
@@ -127,7 +127,7 @@ Requires:   %{name}(X) = %{version}-%{release}
 gtkmidi - GTK+ interface for TiMidity++.
 
 %description gtk -l pl
-gtkmidi - interfejs do TiMidity++ oparty o bibliotekê gtk+.
+gtkmidi - interfejs do TiMidity++ oparty o bibliotekê GTK+.
 
 %package motif
 Summary:       Motif interface for TiMidity++
@@ -236,14 +236,16 @@ AUDIO=oss%{?with_alsa:,alsa}%{?with_arts:,arts}%{?with_esd:,esd}\
        --with-elf \
        %{!?with_X:--without-x}
 
-%{__make}
+%{__make} \
+       SHLIB_DIR=%{_libdir}/timidity
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}/GUSpatches}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       SHLIB_DIR=%{_libdir}/timidity
 
 ## based on timidity/timidity.c
 ##ln -s timidity $RPM_BUILD_ROOT%{_bindir}/kmidi # does it work?
@@ -280,7 +282,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/timidity/interface_n.so
 %{_libdir}/timidity/interface_e.txt
 %{_libdir}/timidity/interface_n.txt
-%{?with_X:%{_libdir}/timidity/bitmaps}
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib/timidity
+%endif
+%{?with_X:%{_prefix}/lib/timidity/bitmaps}
 %{_mandir}/man1/timidity.1*
 %{_mandir}/man5/timidity.cfg.5*
 %lang(ja) %{_mandir}/ja/man1/timidity.1*
@@ -329,8 +334,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/tkmidi
 %attr(755,root,root) %{_libdir}/timidity/interface_k.so
 %{_libdir}/timidity/interface_k.txt
-%{_libdir}/timidity/tclIndex
-%{_libdir}/timidity/*.tcl
+%{_prefix}/lib/timidity/tclIndex
+%{_prefix}/lib/timidity/*.tcl
 %endif
 
 %files vt100