rpms/wvdial/devel wvdial-1.54-9nums.patch, NONE, 1.1 wvdial.spec, 1.28, 1.29

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/wvdial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20859

Modified Files:
	wvdial.spec 
Added Files:
	wvdial-1.54-9nums.patch 
Log Message:
gcc43 rebuild + support for up to 9 alternate phone nums(#178025)

wvdial-1.54-9nums.patch:

--- NEW FILE wvdial-1.54-9nums.patch ---
diff -ru orig/wvdial.conf.5 wvdial/wvdial.conf.5
--- orig/wvdial.conf.5	2003-11-15 03:46:13.000000000 +0800
+++ wvdial/wvdial.conf.5	2006-01-16 16:19:16.000000000 +0800
@@ -78,7 +78,7 @@
 .I Phone
 The phone number you want
 .B wvdial
-to dial. You can add up to 4 other phone numbers that
+to dial. You can add up to 9 other phone numbers that
 .B wvdial
 will dial in order, by adding:
 .TP
@@ -90,6 +90,16 @@
 .TP
 .I Phone4
 .TP
+.I Phone5
+.TP
+.I Phone6
+.TP
+.I Phone7
+.TP
+.I Phone8
+.TP
+.I Phone9
+.TP
 .I Dial Prefix
 .B wvdial
 will insert this string after the dial command and before the phone number.
diff -ru orig/wvdialer.cc wvdial/wvdialer.cc
--- orig/wvdialer.cc	2003-11-15 03:46:13.000000000 +0800
+++ wvdial/wvdialer.cc	2007-01-16 16:14:59.000000000 +0800
@@ -213,7 +213,29 @@
 	    { 
 		phnum_max++;
           	if(options.phnum4.len()) 
-		    phnum_max++;
+ 		{ 
+ 		    phnum_max++;
+		    if(options.phnum5.len()) 
+		    { 
+			phnum_max++;
+			if(options.phnum6.len()) 
+			{ 
+			    phnum_max++;
+			    if(options.phnum7.len()) 
+			    { 
+				phnum_max++;
+				if(options.phnum8.len()) 
+				{ 
+				    phnum_max++;
+				    if(options.phnum9.len()) 
+				    { 
+					phnum_max++;
+				    }
+				}
+			    }
+			}
+		    }
+    		}
 	    }
 	}
    }
@@ -592,6 +612,11 @@
     	{ "Phone2",          &options.phnum2,       NULL, "",               0 },
     	{ "Phone3",          &options.phnum3,       NULL, "",               0 },
     	{ "Phone4",          &options.phnum4,       NULL, "",               0 },
+    	{ "Phone5",          &options.phnum5,       NULL, "",               0 },
+    	{ "Phone6",          &options.phnum6,       NULL, "",               0 },
+    	{ "Phone7",          &options.phnum7,       NULL, "",               0 },
+    	{ "Phone8",          &options.phnum8,       NULL, "",               0 },
+    	{ "Phone9",          &options.phnum9,       NULL, "",               0 },
     	{ "Dial Prefix",     &options.dial_prefix,  NULL, "",               0 },
     	{ "Area Code",       &options.areacode,     NULL, "",               0 },
     	{ "Dial Command",    &options.dial_cmd,     NULL, "ATDT",           0 },
@@ -874,9 +899,24 @@
             case 3:     
 		this_str = &options.phnum3;     
 		break;
-            case 4:
+            case 4:     
+		this_str = &options.phnum4;     
+		break;
+            case 5:     
+		this_str = &options.phnum5;     
+		break;
+            case 6:     
+		this_str = &options.phnum6;     
+		break;
+            case 7:     
+		this_str = &options.phnum7;     
+		break;
+            case 8:     
+		this_str = &options.phnum8;     
+		break;
+            case 9:
             default:
-                this_str = &options.phnum4;     
+                this_str = &options.phnum9;     
 		break;
         }
 
diff -ru orig/wvdialer.h wvdial/wvdialer.h
--- orig/wvdialer.h	2003-11-15 03:46:13.000000000 +0800
+++ wvdial/wvdialer.h	2006-01-16 20:12:54.000000000 +0800
@@ -103,6 +103,11 @@
 	WvString	        phnum2;
 	WvString	        phnum3;
 	WvString	        phnum4;
+	WvString	        phnum5;
+	WvString	        phnum6;
+	WvString	        phnum7;
+	WvString	        phnum8;
+	WvString	        phnum9;
 	WvString	        dial_prefix;
 	WvString	        areacode;
 	WvString	        dial_cmd;


Index: wvdial.spec
===================================================================
RCS file: /cvs/extras/rpms/wvdial/devel/wvdial.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wvdial.spec	29 Oct 2007 19:44:04 -0000	1.28
+++ wvdial.spec	12 Feb 2008 18:34:10 -0000	1.29
@@ -1,13 +1,14 @@
 Summary: A heuristic autodialer for PPP connections
 Name: wvdial
 Version: 1.60
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2
 URL: http://alumnit.ca/wiki/?WvDial
 Group: System Environment/Daemons
 Source0: http://alumnit.ca/download/wvdial-%{version}.tar.gz
 Patch1: wvdial-1.60-remotename.patch
 Patch2: wvdial-1.60-dialtimeout.patch
+Patch3: wvdial-1.54-9nums.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libwvstreams-devel >= 0:4.4 lockdev-devel openssl-devel 
 BuildRequires: pkgconfig
@@ -23,6 +24,7 @@
 %setup -q
 %patch1 -p1 -b .remotename
 %patch2 -p1 -b .dialtimeout
+%patch3 -p1 -b .9nums
 
 %build
 make \
@@ -57,6 +59,11 @@
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
+* Tue Feb 12 2008 Ondrej Vasik <ovasik at redhat.com> - 1.60-4
+- added support for up to 9 alternative numbers instead of 4
+  (#178025, patch by V.Mencl)
+- gcc43 rebuild
+
 * Mon Oct 29 2007 Bill Nottingham <notting at redhat.com> - 1.60-3
 - fix remotename patch (#348831, #344391)