rpms/system-config-soundcard/devel system-config-soundcard-1.2.16-log.patch, NONE, 1.1 system-config-soundcard.spec, 1.29, 1.30

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 3 22:20:47 UTC 2006 

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24410

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-1.2.16-log.patch 
Log Message:
fix for #183524 - scsound.log file not created

system-config-soundcard-1.2.16-log.patch:
 Makefile                           |    1 +
 src/soundcard.py                   |    1 +
 src/soundcardBackend.py            |   11 +++++++++++
 src/system-config-soundcard        |   19 +------------------
 src/system-config-soundcard.logger |   16 ++++++++++++++++
 5 files changed, 30 insertions(+), 18 deletions(-)

--- NEW FILE system-config-soundcard-1.2.16-log.patch ---
--- 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 @@
+#!/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
 
         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"
-
-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
-
-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


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- system-config-soundcard.spec	27 Feb 2006 13:42:06 -0000	1.29
+++ system-config-soundcard.spec	3 Mar 2006 22:20:44 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 1.2.16
-Release: 2
+Release: 3
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
+Patch0:  system-config-soundcard-1.2.16-log.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 ExcludeArch: s390 s390x
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -79,9 +81,14 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-soundcard.png
 %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
 %ghost /root/scsound.log
 
 %changelog
+* Fri Mar 03 2006 Martin Stransky <stransky at redhat.com> 1.2.16-3
+- fix for #183524 - scsound.log file not created after 
+                    failing to configure sound card
+
 * Mon Feb 27 2006 Martin Stransky <stransky at redhat.com> 1.2.16-2
 - added hicolor-icon-theme to PreReq, (#182880, #182881)

More information about the fedora-cvs-commits mailing list