rpms/wvdial/devel wvdial-1.60-dirent.patch, NONE, 1.1 wvdial.spec, 1.35, 1.36

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/wvdial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6135

Modified Files:
	wvdial.spec 
Added Files:
	wvdial-1.60-dirent.patch 
Log Message:
 make wvdial compilable in rawhide (scandir api change), reduce compiler warnings

wvdial-1.60-dirent.patch:

--- NEW FILE wvdial-1.60-dirent.patch ---
diff -urNp wvdial-1.60-orig/wvdialer.cc wvdial-1.60/wvdialer.cc
--- wvdial-1.60-orig/wvdialer.cc	2009-06-11 12:37:13.000000000 +0200
+++ wvdial-1.60/wvdialer.cc	2009-06-11 13:06:06.000000000 +0200
@@ -680,7 +680,7 @@ void WvDialer::load_options()
     	{ NULL,		     NULL, NULL,                   "", 0            }
     };
 
-    char *	d = "Dialer Defaults";
+    const char *	d = "Dialer Defaults";
 
     for( int i=0; opts[i].name != NULL; i++ ) 
     {
Binární soubory wvdial-1.60-orig/.wvdialer.cc.swp a wvdial-1.60/.wvdialer.cc.swp jsou různé
diff -urNp wvdial-1.60-orig/wvdialer.h wvdial-1.60/wvdialer.h
--- wvdial-1.60-orig/wvdialer.h	2009-06-11 12:37:13.000000000 +0200
+++ wvdial-1.60/wvdialer.h	2009-06-11 12:39:30.000000000 +0200
@@ -30,10 +30,10 @@ extern const char wvdial_version_text[];
 struct OptInfo
 /************/
 {
-    char *	name;
+    const char *	name;
     WvString *	str_member;
     int *	int_member;
-    char *	str_default;
+    const char *	str_default;
     int		int_default;
 };
 
diff -urNp wvdial-1.60-orig/wvmodemscan.cc wvdial-1.60/wvmodemscan.cc
--- wvdial-1.60-orig/wvmodemscan.cc	2007-07-19 23:22:26.000000000 +0200
+++ wvdial-1.60/wvmodemscan.cc	2009-06-11 13:16:02.000000000 +0200
@@ -20,7 +20,7 @@ bool     default_asyncmap = false;
 
 // startup at atz atq0 atv1 ate1 ats0 carrier dtr fastdial
 // baudstep reinit done
-static char *commands[WvModemScan::NUM_STAGES] = {
+static const char *commands[WvModemScan::NUM_STAGES] = {
     NULL, "Q0 V1 E1", "Z", "S0=0",
     "&C1", "&D2", "+FCLASS=0", NULL,
     NULL, "", NULL
@@ -496,7 +496,7 @@ static int fileselect(const struct diren
 }
 
 
-static int filesort(const void *_e1, const void *_e2)
+static int filesort(const struct dirent **_e1, const struct dirent **_e2)
 {
     dirent const * const *e1 = (dirent const * const *)_e1;
     dirent const * const *e2 = (dirent const * const *)_e2;


Index: wvdial.spec
===================================================================
RCS file: /cvs/extras/rpms/wvdial/devel/wvdial.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- wvdial.spec	25 Feb 2009 16:16:12 -0000	1.35
+++ wvdial.spec	11 Jun 2009 11:25:17 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: A heuristic autodialer for PPP connections
 Name: wvdial
 Version: 1.60
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2
 URL: http://alumnit.ca/wiki/?WvDial
 Group: System Environment/Daemons
@@ -11,6 +11,7 @@ Patch2: wvdial-1.60-dialtimeout.patch
 Patch3: wvdial-1.54-9nums.patch
 Patch4: wvdial-1.60-compuserve.patch
 Patch5: wvdial-manpages.patch
+Patch6: wvdial-1.60-dirent.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libwvstreams-devel >= 0:4.4 lockdev-devel openssl-devel
 BuildRequires: pkgconfig
@@ -29,6 +30,7 @@ negotiate the PPP connection using any m
 %patch3 -p1 -b .9nums
 %patch4 -p1 -b .compuserve
 %patch5 -p1 -b .manpages
+%patch6 -p1 -b .dirent
 
 %build
 make \
@@ -63,6 +65,10 @@ touch $RPM_BUILD_ROOT/%{_sysconfdir}/wvd
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
+* Thu Jun 11 2009 Ondrej Vasik <ovasik at redhat.com> - 1.60-9
+- make wvdial compilable in rawhide (scandir api change),
+  reduce compiler warnings
+
 * Wed Feb 25 2009 Ondrej Vasik <ovasik at redhat.com> - 1.60-8
 - mark /etc/ppp/peers/wvdial as noreplace