- fixed tk and emacs interfaces packagimg, separated -emacs

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

diff --git a/TiMidity++.spec b/TiMidity++.spec
index 5798fcd3552f8d0f98bc7168aefde01e44440f3a..f54a173c362f2c4bccd02f8c7b8f31f9eaed58a9 100644 (file)
--- a/TiMidity++.spec
+++ b/TiMidity++.spec
@@ -33,9 +33,7 @@ Source6:      timidity.sysconfig
 Source7:       timidity-modules-load.conf
 Source8:       timidity.service
 Patch0:                %{name}-detach.patch
-Patch1:                %{name}-gcc4.patch
 Patch2:                %{name}-configure.patch
-Patch3:                %{name}-stop_polling.patch
 URL:           http://timidity.sourceforge.net/
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 %{?with_arts:BuildRequires:    arts-devel}
@@ -126,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+
@@ -237,13 +248,11 @@ jako silnik syntezatora MIDI w architekturze ALSA.
 
 %prep
 %setup -q
-#%%patch0 -p1
-#%%patch1 -p1
-#%%patch2 -p0
-#%%patch3 -p1
+%patch0 -p1
+%patch2 -p1
 
 for f in doc/ja_JP.eucJP/README*; do
-       mv -f $f ${f}.ja
+       %{__mv} $f ${f}.ja
 done
 
 %build
@@ -284,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
@@ -302,7 +316,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
 
 cd $RPM_BUILD_ROOT%{_datadir}/GUSpatches
 tar xzf %{SOURCE1}
-mv -f instruments/* .
+%{__mv} instruments/* .
 rmdir instruments
 bzip2 -cd %{SOURCE2} > britepno.pat
 bzip2 -cd %{SOURCE3} > pistol.pat
@@ -341,14 +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
-#%{_libdir}/timidity/interface_e.txt
-#%{_libdir}/timidity/interface_n.txt
-%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*
@@ -362,12 +369,16 @@ 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)
 %attr(755,root,root) %{_bindir}/gtkmidi
 %attr(755,root,root) %{_libdir}/timidity/if_gtk.so
-#%{_libdir}/timidity/interface_g.txt
 %endif
 
 %if %{with x}
@@ -375,13 +386,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xmmidi
 %attr(755,root,root) %{_libdir}/timidity/if_motif.so
-#%{_libdir}/timidity/interface_m.txt
 %endif
 
 %files slang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/timidity/if_slang.so
-#%{_libdir}/timidity/interface_s.txt
 
 %if %{with x}
 %files tcltk
@@ -390,15 +399,17 @@ 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
-#%{_libdir}/timidity/interface_k.txt
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib/timidity
+%endif
 %{_prefix}/lib/timidity/tclIndex
 %{_prefix}/lib/timidity/*.tcl
+%{_prefix}/lib/timidity/bitmaps
 %endif
 
 %files vt100
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/timidity/if_vt100.so
-#%{_libdir}/timidity/interface_T.txt
 
 %if %{with x}
 %files xaw
@@ -406,8 +417,7 @@ fi
 %doc doc/C/README.xaw
 %lang(ja) %doc doc/ja_JP.eucJP/README.xaw.ja
 %attr(755,root,root) %{_bindir}/xawmidi
-#%attr(755,root,root) %{_libdir}/timidity/interface_a.so
-#%{_libdir}/timidity/interface_a.txt
+%attr(755,root,root) %{_libdir}/timidity/if_xaw.so
 
 %files xskin
 %defattr(644,root,root,755)
@@ -415,7 +425,6 @@ fi
 %lang(ja) %doc doc/ja_JP.eucJP/README.xskin.ja
 %attr(755,root,root) %{_bindir}/xskinmidi
 %attr(755,root,root) %{_libdir}/timidity/if_xskin.so
-#%{_libdir}/timidity/interface_i.txt
 %endif
 
 %if %{with alsa}