packages: TiMidity++/TiMidity++.spec, TiMidity++/timidity-modules-load.conf...

[baggins]

Author: baggins                      Date: Tue Feb 14 17:31:45 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 8
- added systemd support for alsaseq

---- Files affected:
packages/TiMidity++:
   TiMidity++.spec (1.90 -> 1.91) , timidity-modules-load.conf (NONE -> 1.1)  (NEW), timidity.service (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/TiMidity++/TiMidity++.spec
diff -u packages/TiMidity++/TiMidity++.spec:1.90 packages/TiMidity++/TiMidity++.spec:1.91
--- packages/TiMidity++/TiMidity++.spec:1.90	Thu Dec 16 13:38:24 2010
+++ packages/TiMidity++/TiMidity++.spec	Tue Feb 14 18:31:40 2012
@@ -16,7 +16,7 @@
 Summary(uk.UTF-8):	Програвач MIDI-файлів та конвертор їх в WAV формат
 Name:		TiMidity++
 Version:	2.13.2
-Release:	6
+Release:	8
 License:	GPL
 Group:		Applications/Sound
 Source0:	http://dl.sourceforge.net/timidity/%{name}-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 Source4:	timidity.cfg
 Source5:	timidity.init
 Source6:	timidity.sysconfig
+Source7:	timidity-modules-load.conf
+Source8:	timidity.service
 Patch0:		%{name}-detach.patch
 Patch1:		%{name}-gcc4.patch
 Patch2:		%{name}-configure.patch
@@ -45,7 +47,7 @@
 %{?with_x:BuildRequires:	motif-devel}
 %{?with_nas:BuildRequires:	nas-devel}
 BuildRequires:	ncurses-devel
-BuildRequires:	rpmbuild(macros) >= 1.268
+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}}
@@ -215,6 +217,7 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
 Requires:	rc-scripts
+Requires:	systemd-units >= 37-0.10
 
 %description alsaseq
 The ALSA sequencer interface communicates between ALSA sequencer core
@@ -273,7 +276,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}/GUSpatches,/etc/{rc.d/init.d,sysconfig}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}/GUSpatches,/etc/{rc.d/init.d,sysconfig}} \
+	$RPM_BUILD_ROOT{%{systemdunitdir},/etc/modules-load.d}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -303,18 +307,29 @@
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/timidity
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/timidity
 
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/modules-load.d/timidity.conf
+install %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/timidity.service
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post alsaseq
 /sbin/chkconfig --add timidity
 %service timidity restart "TiMidity++ ALSA sequencer interface"
+%systemd_post timidity.service
 
 %preun alsaseq
 if [ "$1" = "0" ]; then
 	%service timidity stop
 	/sbin/chkconfig --del timidity
 fi
+%systemd_preun timidity.service
+
+%postun
+%systemd_reload
+
+%triggerpostun alsaseq -- %{name}-alsaseq < 2.13.2-8
+%systemd_trigger timidity.service
 
 %files
 %defattr(644,root,root,755)
@@ -405,6 +420,8 @@
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/timidity
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timidity
+%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/timidity.conf
+%{systemdunitdir}/timidity.service
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -413,6 +430,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2012/02/14 17:31:40  baggins
+- rel 8
+- added systemd support for alsaseq
+
 Revision 1.90  2010/12/16 12:38:24  evil
 - added patch to alsaseq server interace that stops in loop polling(saves power/battery) even when idle(constant 99.9 wakeups per second), not its less than 0.1(invisible in powertop) when idle, and goes up to 32 wakeups when playing JazzJackrabbit midis using aplaymidi.
 

================================================================
Index: packages/TiMidity++/timidity-modules-load.conf
diff -u /dev/null packages/TiMidity++/timidity-modules-load.conf:1.1
--- /dev/null	Tue Feb 14 18:31:45 2012
+++ packages/TiMidity++/timidity-modules-load.conf	Tue Feb 14 18:31:40 2012
@@ -0,0 +1,2 @@
+# TiMidity++ needs MIDI sequencer to function
+snd_seq

================================================================
Index: packages/TiMidity++/timidity.service
diff -u /dev/null packages/TiMidity++/timidity.service:1.1
--- /dev/null	Tue Feb 14 18:31:45 2012
+++ packages/TiMidity++/timidity.service	Tue Feb 14 18:31:40 2012
@@ -0,0 +1,10 @@
+[Unit]
+Description=TiMidity++ software MIDI synthesizer
+After=syslog.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/timidity
+ExecStart=/usr/bin/timidity -iA -Os $TIMIDITY_OPTIONS
+
+[Install]
+WantedBy=multi-user.target
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/TiMidity++/TiMidity++.spec?r1=1.90&r2=1.91&f=u