- versioned timidity* Obsoletes, dropped bogus TiMidity++ Obsoletes

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

diff --git a/TiMidity++.spec b/TiMidity++.spec
index 56660735cc69fcedb7902f8c4fe9535d2884890b..2a97b98428198ca3031d4a647802d0912c47b556 100644 (file)
--- a/TiMidity++.spec
+++ b/TiMidity++.spec
@@ -50,9 +50,9 @@ BuildRequires:        rpmbuild(macros) >= 1.626
 BuildRequires: slang-devel >= 2.0.0
 %{?with_x:BuildRequires:       tk-devel >= 8.3.2}
 %{?with_x:Provides:    %{name}(X) = %{version}-%{release}}
-Obsoletes:     timidity
-Obsoletes:     timidity++
-Obsoletes:     timidity++-X11
+Obsoletes:     timidity < 2.10.4
+Obsoletes:     timidity++ < 2.10.4
+Obsoletes:     timidity++-X11 < 2.10.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -112,7 +112,7 @@ Summary(pl.UTF-8):  Instrumenty dla TiMidity++
 Summary(pt_BR.UTF-8):  Instrumentos básicos para o TiMidity++
 Group:         Applications/Sound
 Requires:      %{name}-gspdir = %{version}-%{release}
-Obsoletes:     timidity-patches
+Obsoletes:     timidity-patches < 2.10.4
 
 %description instruments
 Instruments for TiMidity++.
@@ -124,6 +124,19 @@ Instrumenty dla TiMidity++.
 Este pacote inclui um conjunto básico de instrumentos (chamados de
 patches no meio musical) para o TiMidity++.
 
+%package emacs
+Summary:       Emacs interface for TiMidity++
+Summary(pl.UTF-8):     Interfejs TiMidity++ oparty o Emacsa
+Group:         Applications/Sound
+Requires:      %{name} = %{version}-%{release}
+Requires:      emacs
+
+%description emacs
+Emacs interface for TiMidity++.
+
+%description emacs -l pl.UTF-8
+Interfejs TiMidity++ oparty o Emacsa.
+
 %package gtk
 Summary:       GTK+ interface for TiMidity++
 Summary(pl.UTF-8):     Interfejs TiMidity++ oparty o bibliotekę GTK+
@@ -201,7 +214,6 @@ Summary:    "X Skin" interface for TiMidity++
 Summary(pl.UTF-8):     Interfejs TiMidity++ "X Skin"
 Group:         Applications/Sound
 Requires:      %{name}(X) = %{version}-%{release}
-Obsoletes:     TiMidity++ < 2.13.0-3
 
 %description xskin
 xskinmidi - "X Skin" interface for TiMidity++.
@@ -254,8 +266,8 @@ AUDIO=oss%{?with_alsa:,alsa}%{?with_arts:,arts}%{?with_esd:,esd}\
        %{?with_alsa:--enable-alsaseq} \
        --enable-audio=$AUDIO \
        --enable-dynamic \
-       %{?with_x:--enable-gtk=dynamic} \
        --enable-emacs=dynamic \
+       %{?with_x:--enable-gtk=dynamic} \
        %{?with_x:--enable-motif=dynamic} \
        --enable-ncurses=dynamic \
        --enable-network \
@@ -280,8 +292,13 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}/GUSpatches,/etc/{rc.d/init
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
+       ELISP_DIR=%{_datadir}/emacs/site-lisp \
        SHLIB_DIR=%{_libdir}/timidity
 
+# missing in install_tk targets
+%{__make} -C interface install.bitmaps \
+       DESTDIR=$RPM_BUILD_ROOT
+
 ## based on timidity/timidity.c
 ##ln -s timidity $RPM_BUILD_ROOT%{_bindir}/kmidi # does it work?
 ln -sf timidity $RPM_BUILD_ROOT%{_bindir}/gtkmidi
@@ -337,12 +354,7 @@ fi
 %attr(755,root,root) %{_bindir}/timidity
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/timidity.cfg
 %dir %{_libdir}/timidity
-%attr(755,root,root) %{_libdir}/timidity/if_emacs.so
 %attr(755,root,root) %{_libdir}/timidity/if_ncurses.so
-%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*
@@ -356,6 +368,11 @@ fi
 %defattr(644,root,root,755)
 %{_datadir}/GUSpatches/*
 
+%files emacs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/timidity/if_emacs.so
+%{_datadir}/emacs/site-lisp/timidity.el
+
 %if %{with x}
 %files gtk
 %defattr(644,root,root,755)
@@ -381,8 +398,12 @@ fi
 %lang(ja) %doc doc/ja_JP.eucJP/README.tk.ja
 %attr(755,root,root) %{_bindir}/tkmidi
 %attr(755,root,root) %{_libdir}/timidity/if_tcltk.so
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib/timidity
+%endif
 %{_prefix}/lib/timidity/tclIndex
 %{_prefix}/lib/timidity/*.tcl
+%{_prefix}/lib/timidity/bitmaps
 %endif
 
 %files vt100