- fixed tk and emacs interfaces packagimg, separated -emacs

diff --git a/TiMidity++.spec b/TiMidity++.spec
index 56660735cc69fcedb7902f8c4fe9535d2884890b..f54a173c362f2c4bccd02f8c7b8f31f9eaed58a9 100644 (file)
--- a/TiMidity++.spec
+++ b/TiMidity++.spec
@@ -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+
@@ -280,8 +293,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 +355,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 +369,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 +399,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