rpms/alsa-utils/devel alsa-utils.spec,1.21,1.22 salsa.c,1.4,1.5

[fedora-cvs-commits redhat com]

Author: notting

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv692

Modified Files:
	alsa-utils.spec salsa.c 
Log Message:
move alsaunmute, alsacard to /bin



Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- alsa-utils.spec	13 Jul 2005 19:04:22 -0000	1.21
+++ alsa-utils.spec	21 Jul 2005 14:45:18 -0000	1.22
@@ -48,8 +48,9 @@
 install -m 755 salsa $RPM_BUILD_ROOT/sbin
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/udev/rules.d/
 install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d
-install -m 755 alsacard  %{buildroot}%{_bindir}
-install -m 755 alsaunmute  %{buildroot}%{_bindir}
+mkdir -p -m755 $RPM_BUILD_ROOT/bin
+install -m 755 alsaunmute  %{buildroot}/bin
+install -m 755 alsacard  %{buildroot}/bin
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -58,6 +59,7 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README TODO
 /etc/udev/rules.d/*
+/bin/*
 %{_bindir}/*
 %{_sbindir}/*
 /sbin/*
@@ -70,6 +72,7 @@
 * Wed Jul 13 2005 Bill Nottingham <notting redhat com> 1.0.9-4
 - migrate the alsa restore program to a udev rule, not a dev.d program
 - conflict with appropriate udev
+- move alsaunmute, alsacard to /bin
 
 * Mon Jul 11 2005 Martin Stransky <stransky redhat com> 1.0.9-3
 - New alsaunmute utility


Index: salsa.c
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/salsa.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- salsa.c	11 Jul 2005 13:11:40 -0000	1.4
+++ salsa.c	21 Jul 2005 14:45:20 -0000	1.5
@@ -91,7 +91,7 @@
   char tmp[100];  
   snprintf(tmp, 100, "%d", index);
   tmp[99] = '\0';
-  execl("//usr//bin//alsaunmute","//usr//bin//alsaunmute", tmp, "-v", NULL);
+  execl("/bin/alsaunmute","/bin/alsaunmute", tmp, "-v", NULL);
 }
 
 int main(int argc, char **argv)