rpms/system-config-soundcard/devel system-config-soundcard-1.2.16-log.patch, 1.1, 1.2 system-config-soundcard.spec, 1.30, 1.31
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 7 09:58:50 UTC 2006
- Previous message (by thread): rpms/glibc/devel glibc-fedora.patch, 1.144, 1.145 glibc.spec, 1.228, 1.229 sources, 1.165, 1.166
- Next message (by thread): rpms/mkbootdisk/devel mkbootdisk-x86_64.patch, NONE, 1.1 mkbootdisk.spec, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stransky
Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9377
Modified Files:
system-config-soundcard-1.2.16-log.patch
system-config-soundcard.spec
Log Message:
modified log patch
system-config-soundcard-1.2.16-log.patch:
Makefile | 2 ++
src/soundcard.py | 1 +
src/soundcardBackend.py | 21 +++++++++++++--------
src/system-config-soundcard | 15 ---------------
src/system-config-soundcard.logger | 16 ++++++++++++++++
src/system-config-soundcard.play | 6 ++++++
6 files changed, 38 insertions(+), 23 deletions(-)
Index: system-config-soundcard-1.2.16-log.patch
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard-1.2.16-log.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-soundcard-1.2.16-log.patch 3 Mar 2006 22:20:44 -0000 1.1
+++ system-config-soundcard-1.2.16-log.patch 7 Mar 2006 09:58:46 -0000 1.2
@@ -1,66 +1,18 @@
---- system-config-soundcard-1.2.16/Makefile.old 2006-01-30 09:46:57.000000000 +0100
-+++ system-config-soundcard-1.2.16/Makefile 2006-03-03 22:11:14.000000000 +0100
-@@ -29,6 +29,7 @@
- mkdir -p $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
- mkdir -p $(INSTROOT)/usr/share/applications
- install src/*.py $(INSTROOT)$(PKGDATADIR)
-+ install src/*.logger $(INSTROOT)$(PKGDATADIR)
- install src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME}
- install src/sound-sample.wav $(INSTROOT)$(PKGDATADIR)/sound-sample.wav
- install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}
---- /dev/null 2006-03-03 20:50:29.888481500 +0100
-+++ system-config-soundcard-1.2.16/src/system-config-soundcard.logger 2006-03-03 22:11:14.000000000 +0100
-@@ -0,0 +1,16 @@
+--- /dev/null 2006-03-01 12:49:27.336509500 +0100
++++ system-config-soundcard-1.2.16/src/system-config-soundcard.play 2006-03-07 10:39:55.000000000 +0100
+@@ -0,0 +1,6 @@
+#!/bin/sh
+
+LOG_FILE="/root/scsound.log"
-+
-+echo -e "------- System Config Soundcard --------\n`date`\n" > $LOG_FILE 2>&1
-+echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1
-+echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1
-+echo -e "------- /etc/modprobe.conf --------\n`cat /etc/modprobe.conf`\n" >> $LOG_FILE 2>&1
-+echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1
-+echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1
-+echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1
-+echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1
-+echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1
-+echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1
-+echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1
-+echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1
---- system-config-soundcard-1.2.16/src/soundcardBackend.py.old 2006-02-07 13:09:59.000000000 +0100
-+++ system-config-soundcard-1.2.16/src/soundcardBackend.py 2006-03-03 22:17:20.000000000 +0100
-@@ -483,3 +483,14 @@
- return self.defaultModule
++echo -e "------- Playng wav --------\n" >> $LOG_FILE 2>&1
++echo $1 $2 $3 $4 $5 $6 >> $LOG_FILE 2>&1
++exec $1 $2 $3 $4 $5 $6 >> $LOG_FILE 2>&1
+--- system-config-soundcard-1.2.16/src/system-config-soundcard.log 2006-02-07 13:09:59.000000000 +0100
++++ system-config-soundcard-1.2.16/src/system-config-soundcard 2006-03-07 10:39:55.000000000 +0100
+@@ -2,20 +2,5 @@
- return 0
-+
-+ def writeLog(self):
-+ amixer_pid = os.fork()
-+ if (not amixer_pid):
-+ try:
-+ os.execv(amixer_path, amixer_args)
-+ except:
-+ sys.exit(0)
-+ else:
-+ os.waitpid(amixer_pid,0)
-+ return 0
---- system-config-soundcard-1.2.16/src/soundcard.py.old 2006-02-07 13:26:51.000000000 +0100
-+++ system-config-soundcard-1.2.16/src/soundcard.py 2006-03-03 22:11:14.000000000 +0100
-@@ -469,6 +469,7 @@
- dlg.destroy()
-
- if rc == gtk.RESPONSE_NO:
-+ self.soundcardBackend.writeLog()
- #Oh well, they couldn't hear the sound. Notify the user and then quit. We did our best
- self.showErrorDialog(_("Automatic detection of the sound card did not work. " \
- "Audio will not be available on the system.\n" \
---- system-config-soundcard-1.2.16/src/system-config-soundcard.old 2006-02-07 13:09:59.000000000 +0100
-+++ system-config-soundcard-1.2.16/src/system-config-soundcard 2006-03-03 22:11:14.000000000 +0100
-@@ -1,21 +1,4 @@
- #!/bin/sh
+ LOG_FILE="/root/scsound.log"
--LOG_FILE="/root/scsound.log"
--
-echo -e "------- System Config Soundcard --------\n`date`\n" > $LOG_FILE 2>&1
-echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1
-echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1
@@ -77,5 +29,88 @@
-echo -e "------- system-config-soundcard --------\n" >> $LOG_FILE 2>&1
-
export PYTHONPATH=/usr/share/system-config-soundcard
--/usr/bin/python2 /usr/share/system-config-soundcard/system-config-soundcard.py >> $LOG_FILE 2>&1
-+/usr/bin/python2 /usr/share/system-config-soundcard/system-config-soundcard.py
+ /usr/bin/python2 /usr/share/system-config-soundcard/system-config-soundcard.py >> $LOG_FILE 2>&1
+--- system-config-soundcard-1.2.16/src/soundcard.py.log 2006-02-07 13:26:51.000000000 +0100
++++ system-config-soundcard-1.2.16/src/soundcard.py 2006-03-07 10:39:55.000000000 +0100
+@@ -469,6 +469,7 @@
+ dlg.destroy()
+
+ if rc == gtk.RESPONSE_NO:
++ self.soundcardBackend.writeLog()
+ #Oh well, they couldn't hear the sound. Notify the user and then quit. We did our best
+ self.showErrorDialog(_("Automatic detection of the sound card did not work. " \
+ "Audio will not be available on the system.\n" \
+--- system-config-soundcard-1.2.16/src/soundcardBackend.py.log 2006-02-07 13:09:59.000000000 +0100
++++ system-config-soundcard-1.2.16/src/soundcardBackend.py 2006-03-07 10:40:19.000000000 +0100
+@@ -195,24 +195,25 @@
+ if self.aplay_pid != 0:
+ return
+
++ path = "/usr/share/system-config-soundcard/system-config-soundcard.play"
++
+ if kernel_type == '2.6':
+ device = "plughw:%d,0"% index
+-
+- path = "/usr/bin/aplay"
+- args = [path, "-D", device, "-N", "/usr/share/system-config-soundcard/sound-sample.wav"]
++ args = [path, "/usr/bin/aplay", "-D", device, "-N", "/usr/share/system-config-soundcard/sound-sample.wav"]
+
+ if kernel_type == "2.4":
+ if self.dspList == []:
+ device = "/dev/dsp"
+ else:
+- device = "/dev/dsp%d" % self.dspList.index(module)
+-
+- path = "/usr/bin/play"
+- args = [path, "-d", device, "/usr/share/system-config-soundcard/sound-sample.wav", "-v", "2"]
++ device = "/dev/dsp%d" % self.dspList.index(module)
++ args = [path, "/usr/bin/play", "-d", device, "/usr/share/system-config-soundcard/sound-sample.wav", "-v", "2"]
+
+ self.aplay_pid = os.fork()
+ if (not self.aplay_pid):
+- os.execv(path, args)
++ try:
++ os.execv(path, args)
++ except:
++ sys.exit(0)
+
+ def stopTestSound(self):
+ # Kill the child process
+@@ -483,3 +484,7 @@
+ return self.defaultModule
+
+ return 0
++
++ def writeLog(self):
++ os.system("/usr/share/system-config-soundcard/system-config-soundcard.logger")
++ return 0
+--- /dev/null 2006-03-01 12:49:27.336509500 +0100
++++ system-config-soundcard-1.2.16/src/system-config-soundcard.logger 2006-03-07 10:39:55.000000000 +0100
+@@ -0,0 +1,16 @@
++#!/bin/sh
++
++LOG_FILE="/root/scsound.log"
++
++echo -e "------- System Config Soundcard Log --------\n`date`\n" >> $LOG_FILE 2>&1
++echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1
++echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1
++echo -e "------- /etc/modprobe.conf --------\n`cat /etc/modprobe.conf`\n" >> $LOG_FILE 2>&1
++echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1
++echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1
++echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1
++echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1
++echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1
++echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1
++echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1
++echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1
+--- system-config-soundcard-1.2.16/Makefile.log 2006-01-30 09:46:57.000000000 +0100
++++ system-config-soundcard-1.2.16/Makefile 2006-03-07 10:39:55.000000000 +0100
+@@ -29,6 +29,8 @@
+ mkdir -p $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
+ mkdir -p $(INSTROOT)/usr/share/applications
+ install src/*.py $(INSTROOT)$(PKGDATADIR)
++ install src/*.logger $(INSTROOT)$(PKGDATADIR)
++ install src/*.play $(INSTROOT)$(PKGDATADIR)
+ install src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME}
+ install src/sound-sample.wav $(INSTROOT)$(PKGDATADIR)/sound-sample.wav
+ install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}
Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-soundcard.spec 3 Mar 2006 22:20:44 -0000 1.30
+++ system-config-soundcard.spec 7 Mar 2006 09:58:46 -0000 1.31
@@ -82,6 +82,7 @@
%attr(0644,root,root) %config /etc/security/console.apps/system-config-soundcard
%attr(0644,root,root) %config /etc/pam.d/system-config-soundcard
%attr(0755,root,root) /usr/share/system-config-soundcard/system-config-soundcard.logger
+%attr(0755,root,root) /usr/share/system-config-soundcard/system-config-soundcard.play
%ghost /root/scsound.log
%changelog
- Previous message (by thread): rpms/glibc/devel glibc-fedora.patch, 1.144, 1.145 glibc.spec, 1.228, 1.229 sources, 1.165, 1.166
- Next message (by thread): rpms/mkbootdisk/devel mkbootdisk-x86_64.patch, NONE, 1.1 mkbootdisk.spec, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list