rpms/alsa-utils/devel .cvsignore, 1.25, 1.26 alsa-info.sh, 1.3, 1.4 alsa-utils.spec, 1.74, 1.75 sources, 1.29, 1.30

[Jaroslav Kysela]

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7815

Modified Files:
	.cvsignore alsa-info.sh alsa-utils.spec sources 
Log Message:
updated to 1.0.18 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 Sep 2008 09:03:42 -0000	1.25
+++ .cvsignore	4 Nov 2008 09:46:31 -0000	1.26
@@ -18,3 +18,4 @@
 alsa-utils-1.0.16.tar.bz2
 alsa-utils-1.0.17.tar.bz2
 alsa-utils-1.0.18rc3.tar.bz2
+alsa-utils-1.0.18.tar.bz2


Index: alsa-info.sh
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-info.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa-info.sh	11 Sep 2008 09:03:42 -0000	1.3
+++ alsa-info.sh	4 Nov 2008 09:46:31 -0000	1.4
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.51
+SCRIPT_VERSION=0.4.52
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
@@ -46,26 +46,45 @@
 	if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
 		if [[ -n $DIALOG ]]
 		then
-			dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to install it?" 0 0
+			if [ -w $0 ]; then
+				dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to install it?" 0 0
+			else
+				dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to download it?" 0 0
+			fi
 			DIALOG_EXIT_CODE=$?
 			if [[ $DIALOG_EXIT_CODE = 0 ]]
 			then
-				cp /tmp/alsa-info.sh $0
-				echo "ALSA-Info script has been updated to v $REMOTE_VERSION"
+				echo "Newer version detected: $REMOTE_VERSION"
 				echo "To view the ChangeLog, please visit $CHANGELOG"
-				echo "Please re-run the script"
+				if [ -w $0 ]; then
+					cp /tmp/alsa-info.sh $0
+					echo "ALSA-Info script has been updated to v $REMOTE_VERSION"
+					echo "Please re-run the script"
+					rm /tmp/alsa-info.sh 2>/dev/null
+				else
+					echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+					echo "Please re-run the script from new location."
+				fi
 				exit
+			else
+				rm /tmp/alsa-info.sh 2>/dev/null
 			fi
 		else
-			cp /tmp/alsa-info.sh $0
 			echo "Newer version detected: $REMOTE_VERSION"
 			echo "To view the ChangeLog, please visit $CHANGELOG"
-			echo "ALSA-Info script has been updated. Please re-run it."
-
+			if [ -w $0 ]; then
+				cp /tmp/alsa-info.sh $0
+				echo "ALSA-Info script has been updated. Please re-run it."
+				rm /tmp/alsa-info.sh 2>/dev/null
+			else
+				echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+				echo "Please, re-run it from new location."
+			fi
 			exit
 		fi
+	else
+		rm /tmp/alsa-info.sh 2>/dev/null
 	fi
-	rm /tmp/alsa-info.sh 2>/dev/null
 }
 
 cleanup() {
@@ -373,7 +392,7 @@
 echo "" >> $FILE
 fi
 
-if [ -d $SYSFS ]
+if [ -d "$SYSFS" ]
 then
 echo "!!Loaded sound module options" >> $FILE
 echo "!!--------------------------" >> $FILE


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- alsa-utils.spec	18 Sep 2008 08:38:59 -0000	1.74
+++ alsa-utils.spec	4 Nov 2008 09:46:31 -0000	1.75
@@ -1,10 +1,10 @@
-%define  prever         rc3
-%define  prever_dot     .rc3
+#define  prever         rc3
+#define  prever_dot     .rc3
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: 1.0.18
-Release: 3%{?prever_dot}%{?dist}
+Release: 4%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -96,6 +96,10 @@
 fi
 
 %changelog
+* Tue Nov 04 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-4
+- updated to 1.0.18 final
+- updated alsa-info.sh script
+
 * Thu Sep 18 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-3.rc3
 - fixed alsa-info.sh link
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	11 Sep 2008 09:03:42 -0000	1.29
+++ sources	4 Nov 2008 09:46:31 -0000	1.30
@@ -1 +1 @@
-31ff44de50e6725974b3d2e032ab214d  alsa-utils-1.0.18rc3.tar.bz2
+0a6b26d27cc2adfd591d91d8c155fdb7  alsa-utils-1.0.18.tar.bz2