packages: alsa-utils/alsa-utils.spec - rel 2 - added systemd units - merge ...

[baggins]

Author: baggins                      Date: Tue Apr 17 16:54:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- added systemd units
- merge udev rules into main package, there is no point in keeping them separated

---- Files affected:
packages/alsa-utils:
   alsa-utils.spec (1.178 -> 1.179) 

---- Diffs:

================================================================
Index: packages/alsa-utils/alsa-utils.spec
diff -u packages/alsa-utils/alsa-utils.spec:1.178 packages/alsa-utils/alsa-utils.spec:1.179
--- packages/alsa-utils/alsa-utils.spec:1.178	Fri Jan 27 17:12:05 2012
+++ packages/alsa-utils/alsa-utils.spec	Tue Apr 17 18:54:37 2012
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# TODO: --with-systemdsystemunitdir
 Summary:	Advanced Linux Sound Architecture (ALSA) - Utils
 Summary(es.UTF-8):	Utilitarios para ALSA (Advanced Linux Sound Architecture)
 Summary(pl.UTF-8):	Advanced Linux Sound Architecture (ALSA) - Narzędzia
@@ -8,7 +7,7 @@
 Summary(uk.UTF-8):	Утиліти командного рядка для ALSA project
 Name:		alsa-utils
 Version:	1.0.25
-Release:	1
+Release:	2
 # some apps GPL v2, some GPL v2+
 License:	GPL v2
 Group:		Applications/Sound
@@ -36,10 +35,12 @@
 Requires:	awk
 Requires:	dialog
 Requires:	diffutils
+Requires:	systemd-units >= 0.38
 Requires:	which
 Suggests:	gpm
 Obsoletes:	alsa-udev
 Obsoletes:	alsaconf
+Obsoletes:	udev-alsa
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -84,19 +85,6 @@
 - amixer - мікшер, який керується з командного рядка
 - alsamixer - мікшер з інтерфейсом ncurses
 
-%package -n udev-alsa
-Summary:	udev rules for Advanced Linux Sound Architecture
-Summary(pl.UTF-8):	Reguły udeva dla Advanced Linux Sound Architecture
-Group:		Applications/Sound
-Requires:	%{name} = %{version}-%{release}
-Requires:	udev-core
-
-%description -n udev-alsa
-udev rules for Advanced Linux Sound Architecture.
-
-%description -n udev-alsa -l pl.UTF-8
-Reguły udeva dla Advanced Linux Sound Architecture.
-
 %package init
 Summary:	Init script for Advanced Linux Sound Architecture
 Summary(pl.UTF-8):	Skrypt init dla Advanced Linux Sound Architecture
@@ -127,7 +115,9 @@
 CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
 # we need alsactl for udev as early as possible
 %configure \
-	--sbindir=/sbin
+	--sbindir=/sbin \
+	--with-systemdsystemunitdir=%{systemdunitdir}
+
 %{__make}
 
 %install
@@ -202,6 +192,11 @@
 # symlink
 %attr(755,root,root) %{_sbindir}/alsactl
 %{_sysconfdir}/alsa/alsactl.conf
+%{systemdunitdir}/alsa-restore.service
+%{systemdunitdir}/alsa-store.service
+%{systemdunitdir}/basic.target.wants/alsa-restore.service
+%{systemdunitdir}/shutdown.target.wants/alsa-store.service
+/lib/udev/rules.d/90-alsa-restore.rules
 %dir /var/lib/alsa
 %dir /lib/alsa
 /lib/alsa/init
@@ -226,10 +221,6 @@
 %{_mandir}/man8/alsaconf.8*
 %lang(fr) %{_mandir}/fr/man8/alsaconf.8*
 
-%files -n udev-alsa
-%defattr(644,root,root,755)
-/lib/udev/rules.d/90-alsa-restore.rules
-
 %files init
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/alsasound
@@ -241,6 +232,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.179  2012/04/17 16:54:37  baggins
+- rel 2
+- added systemd units
+- merge udev rules into main package, there is no point in keeping them separated
+
 Revision 1.178  2012/01/27 16:12:05  qboosh
 - updated alsa-lib install time dependency
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/alsa-utils/alsa-utils.spec?r1=1.178&r2=1.179