- unified

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

diff --git a/TiMidity++.spec b/TiMidity++.spec
index 5b28d2f184639cdf72bff09d06a210866b83449d..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
@@ -34,13 +34,14 @@ URL:                http://timidity.sourceforge.net/
 BuildRequires: autoconf
 %{?with_esd:BuildRequires:     esound-devel}
 %{?with_jack:BuildRequires:    jack-audio-connection-kit-devel}
-BuildRequires: gtk+-devel
-BuildRequires: motif-devel
+%{?with_X:BuildRequires:       gtk+-devel}
+%{?with_X:BuildRequires:       motif-devel}
 %{?with_nas:BuildRequires:     nas-devel}
 BuildRequires: ncurses-devel
 BuildRequires: slang-devel
-BuildRequires: tk-devel >= 8.3.2
+%{?with_X:BuildRequires:       tk-devel >= 8.3.2}
 %{?with_vorbis:BuildRequires:  libvorbis-devel}
+%{?with_X:Provides:    %{name}(X) = %{version}-%{release}}
 Obsoletes:     timidity
 Obsoletes:     timidity++
 Obsoletes:     timidity++-X11
@@ -118,21 +119,21 @@ 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} = %{version}-%{release}
+Requires:      %{name}(X) = %{version}-%{release}
 
 %description gtk
 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++
 Summary(pl):   Interfejs TiMidity++ oparty o Motif
 Group:         Applications/Sound
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}(X) = %{version}-%{release}
 
 %description motif
 xmmidi - Motif interface for TiMidity++.
@@ -156,7 +157,7 @@ Interfejs do TiMidity++ oparty o bibliotek
 Summary:       Tcl/Tk interface for TiMidity++
 Summary(pl):   Interfejs TiMidity++ oparty o Tcl/Tk
 Group:         Applications/Sound
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}(X) = %{version}-%{release}
 
 %description tcltk
 tkmidi - Tcl/Tk interface for TiMidity++.
@@ -180,7 +181,7 @@ Interfejs do TiMidity++ mog
 Summary:       Athena interface for TiMidity++
 Summary(pl):   Interfejs TiMidity++ oparty o Athena Widgets
 Group:         Applications/Sound
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}(X) = %{version}-%{release}
 
 %description xaw
 xawmidi - Athena interface for TiMidity++.
@@ -189,17 +190,17 @@ xawmidi - Athena interface for TiMidity++.
 xawmidi - interfejs do TiMidity++ oparty o biblitekê widgetów Athena.
 
 %package xskin
-Summary:       X skin interface for TiMidity++
-Summary(pl):   Interfejs TiMidity++ "X skin" 
+Summary:       "X Skin" interface for TiMidity++
+Summary(pl):   Interfejs TiMidity++ "X Skin" 
 Group:         Applications/Sound
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}(X) = %{version}-%{release}
 Obsoletes:     TiMidity++ < 2.13.0-3
 
 %description xskin
-xskinmidi - X skin interface for TiMidity++.
+xskinmidi - "X Skin" interface for TiMidity++.
 
 %description xskin -l pl
-xskinmidi - interfejs do TiMidity++ "X skin"
+xskinmidi - interfejs do TiMidity++ "X Skin".
 
 %prep
 %setup -q
@@ -235,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?
@@ -279,8 +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
-# TODO (only tcl iface uses it?)
-%{?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