X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=TiMidity%2B%2B.spec;h=5ffb02ab22025184bd83c04c6287606ae623bf46;hb=6062f9c78c0793a78984f27656f2d19a65c31d34;hp=ea2787709cb47871d93e9ab4b2dc983ab6f7f211;hpb=0049ea422828453f6b236c2429aad48d15a690e2;p=packages%2FTiMidity%2B%2B.git

diff --git a/TiMidity++.spec b/TiMidity++.spec
index ea27877..5ffb02a 100644
--- a/TiMidity++.spec
+++ b/TiMidity++.spec
@@ -6,16 +6,17 @@ Summary:	TiMidity++ - MIDI to WAV converter and player
 Summary(pl):	TiMidity++ - konwerter do WAV oraz odtwarzacz plików MIDI
 Name:		TiMidity++
 Version:	2.10.4
-Release:	1
+Release:	5
 License:	GPL
 Vendor:		Masanao Izumo <mo@goice.co.jp>
 Group:		Applications/Sound
 Group(de):	Applikationen/Laut
 Group(pl):	Aplikacje/D¼wiêk
 Source0:	http://www.goice.co.jp/member/mo/timidity/dist/%{name}-%{version}.tar.bz2
-Source1:	http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
+Source1:	http://archive.cs.umbc.edu/pub/midia/instruments.tar.gz
 Source2:	timidity.cfg
 Patch0:		%{name}-config.patch
+URL:		http://www.goice.co.jp/member/mo/timidity/
 %ifnarch sparc sparc64
 %{!?_without_alsa:BuildRequires:	alsa-lib-devel}
 %endif
@@ -24,7 +25,7 @@ BuildRequires:	motif-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	slang-devel
 BuildRequires:	tk-devel >= 8.3.2
-URL:		http://www.goice.co.jp/member/mo/timidity/
+BuildRequires:	autoconf
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	timidity
 Obsoletes:	timidity++
@@ -141,18 +142,20 @@ Group:		Applications/Sound
 Group(de):	Applikationen/Laut
 Group(pl):	Aplikacje/D¼wiêk
 Requires:	%{name}
+Obsoletes:	timidity-patches
 
 %description instruments
-instruments for TiMidity++.
+Instruments for TiMidity++.
 
 %description instruments -l pl
-instrumenty dla TiMidity++
+Instrumenty dla TiMidity++.
 
 %prep
 %setup -q
 %patch0 -p1
 
 %build
+autoconf
 %configure \
 	--with-elf \
 	--enable-dynamic \
@@ -186,15 +189,19 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}/GUSpatches}
 
 ## based on timidity/timidity.c
 ##ln -s timidity $RPM_BUILD_ROOT%{_bindir}/kmidi # does it work?
-ln -s timidity $RPM_BUILD_ROOT%{_bindir}/gtkmidi
-ln -s timidity $RPM_BUILD_ROOT%{_bindir}/tkmidi
-ln -s timidity $RPM_BUILD_ROOT%{_bindir}/xmmidi
-ln -s timidity $RPM_BUILD_ROOT%{_bindir}/xawmidi
-ln -s timidity $RPM_BUILD_ROOT%{_bindir}/xskinmidi
+ln -sf timidity $RPM_BUILD_ROOT%{_bindir}/gtkmidi
+ln -sf timidity $RPM_BUILD_ROOT%{_bindir}/tkmidi
+ln -sf timidity $RPM_BUILD_ROOT%{_bindir}/xmmidi
+ln -sf timidity $RPM_BUILD_ROOT%{_bindir}/xawmidi
+ln -sf timidity $RPM_BUILD_ROOT%{_bindir}/xskinmidi
 
 install %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}
 
-(cd $RPM_BUILD_ROOT%{_datadir}/GUSpatches ;tar xvjf %{SOURCE1})
+(cd $RPM_BUILD_ROOT%{_datadir}/GUSpatches
+tar xzf %{SOURCE1}
+mv -f instruments/* .
+rmdir instruments
+)
 
 gzip -9nf AUTHORS README* ChangeLog* NEWS doc/C/{CHANGES*,FAQ,README*}