rpms/wvdial/F-12 wvdial.spec,1.37,1.38

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/wvdial/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv910

Modified Files:
	wvdial.spec 
Log Message:
 Merge review cleanup (#226546), comment patches, license  to LGPLv2+, specify names in files section, fix source0 link...


Index: wvdial.spec
===================================================================
RCS file: /cvs/extras/rpms/wvdial/F-12/wvdial.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- wvdial.spec	27 Jul 2009 07:30:14 -0000	1.37
+++ wvdial.spec	10 Dec 2009 12:15:16 -0000	1.38
@@ -1,21 +1,31 @@
 Summary: A heuristic autodialer for PPP connections
 Name: wvdial
 Version: 1.60
-Release: 10%{?dist}
-License: LGPLv2
+Release: 11%{?dist}
+License: LGPLv2+
 URL: http://alumnit.ca/wiki/?WvDial
 Group: System Environment/Daemons
-Source0: http://alumnit.ca/download/wvdial-%{version}.tar.gz
+#Old location for <1.61 was http://alumnit.ca/download/wvdial-%{version}.tar.gz
+Source0: http://wvstreams.googlecode.com/files/wvdial-%{version}.tar.gz
+
+#allow specifying the remotename at startup-time
 Patch1: wvdial-1.60-remotename.patch
-Patch2: wvdial-1.60-dialtimeout.patch
+# added option for dial timeout(#200375) - in upstream now
+Patch2: wvdial-1.60-dialtimeout
+#added support for up to 9 alternative numbers instead of 4(#178025)
 Patch3: wvdial-1.54-9nums.patch
+#change Compuserve "Classic" login prompt to the "new" style (#146664)
 Patch4: wvdial-1.60-compuserve.patch
+#fixed wvdial.conf (5) manpage (#440161)
 Patch5: wvdial-manpages.patch
+#make wvdial compilable in rawhide (scandir api change),
+#reduce compiler warnings
 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: libwvstreams-devel lockdev-devel openssl-devel
 BuildRequires: pkgconfig
-Requires: ppp >= 0:2.3.7
+Requires: ppp
 
 %description
 WvDial automatically locates and configures modems and can log into
@@ -33,6 +43,7 @@ negotiate the PPP connection using any m
 %patch6 -p1 -b .dirent
 
 %build
+%configure
 make \
 	CPPOPTS="$RPM_OPT_FLAGS -DUSE_LOCKDEV=1" \
 	LOCKDEV=-llockdev \
@@ -43,7 +54,7 @@ make \
 	PPPDIR=%{_sysconfdir}/ppp/peers $@
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 make install \
 	PREFIX=${RPM_BUILD_ROOT}%{_prefix} \
 	BINDIR=${RPM_BUILD_ROOT}%{_bindir} \
@@ -53,18 +64,24 @@ rm $RPM_BUILD_ROOT/%{_sysconfdir}/ppp/pe
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/wvdial.conf
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGES* COPYING* README* TODO FAQ
-%attr(0755,root,root)	%{_bindir}/*
-%attr(0644,root,root)	%{_mandir}/man1/*
-%attr(0644,root,root)	%{_mandir}/man5/*
+%{_bindir}/wvdialconf
+%{_bindir}/wvdial
+%{_mandir}/man1/wvdialconf.*
+%{_mandir}/man1/wvdial.*
+%{_mandir}/man5/wvdial.conf*
 %attr(0600,root,daemon)	%config(noreplace) %{_sysconfdir}/ppp/peers/wvdial
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
+* Thu Dec 10 2009 Ondrej Vasik <ovasik at redhat.com> - 1.61-11
+- Merge review cleanup (#226546), comment patches, license
+  to LGPLv2+, specify names in files section, fix source0 link...
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild