rpms/wireless-tools/FC-2 sources, 1.7, 1.8 wireless-tools-25-makefile.patch, 1.2, 1.3 wireless-tools.spec, 1.16, 1.17

Fri Apr 1 15:37:11 UTC 2005

Update of /cvs/dist/rpms/wireless-tools/FC-2
In directory cvs.devel.redhat.com:/tmp/cvs-serv6289

Modified Files:
	sources wireless-tools-25-makefile.patch wireless-tools.spec 
Log Message:
* Fri Apr  1 2005 Dan Williams <dcbw at redhat.com> 27-1
- Update to final wireless-tools-27
- loosen WEXT version check to suppress messages to console
- wait longer for scan to finish for devices that need more
	time to scan all their channels
- Drop integrated scan leak patch




Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/FC-2/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8

--- sources	9 Sep 2004 14:25:09 -0000	1.7
+++ sources	1 Apr 2005 15:37:08 -0000	1.8
@@ -1 +1 @@
-a037f5c19ab8f3a89acb09e8cfd22d5b  wireless_tools.26.tar.gz
+29891b66f23565e7e381d28404abb29a  wireless_tools.27.tar.gz

wireless-tools-25-makefile.patch:
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: wireless-tools-25-makefile.patch
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/FC-2/wireless-tools-25-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wireless-tools-25-makefile.patch	9 Sep 2004 14:25:09 -0000	1.2
+++ wireless-tools-25-makefile.patch	1 Apr 2005 15:37:08 -0000	1.3
@@ -1,28 +1,23 @@
---- wireless_tools.26/Makefile.orig	2003-06-18 03:38:58.000000000 +0200
-+++ wireless_tools.26/Makefile	2003-08-10 01:40:55.000000000 +0200
-@@ -78,10 +78,10 @@
- 
- # Do we want to build with or without libm ?
- ifdef BUILD_NOLIBM
--  LIBS=
-+  LIBS=-L. -liw
-   WELIB_FLAG = -DWE_NOLIBM=y
- else
--  LIBS= -lm
-+  LIBS=-L. -liw -lm
+--- wireless_tools.27/Makefile.makefile	2004-06-15 14:40:12.000000000 -0400
++++ wireless_tools.27/Makefile	2004-09-27 15:30:36.000000000 -0400
+@@ -77,12 +77,15 @@
+   LIBS= -lm
  endif
  
- #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror
-@@ -92,7 +92,7 @@
- all:: $(STATIC) $(DYNAMIC) $(PROGS)
++ifndef OPT_FLAGS
++  OPT_FLAGS=
++endif
+ # Other flags
+ CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
+ 	-Wpointer-arith -Wcast-qual -Winline -I.
+ #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
+ DEPFLAGS=-MMD
+-XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG)
++XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(OPT_FLAGS)
+ PICFLAG=-fPIC
  
- %: %.o
--	$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $< $(LIBS)
- %.o: %.c
- 	$(CC) $(XCFLAGS) -c $<
- %.so: %.c
-@@ -117,6 +117,7 @@
+ # Standard compilation targets
+@@ -118,6 +121,7 @@
  # Compilation of the dynamic library
  $(DYNAMIC): $(OBJS:.o=.so)
  	$(CC) -shared -o $@ -Wl,-soname,$@ $(LIBS) -lc $^


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/FC-2/wireless-tools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wireless-tools.spec	9 Sep 2004 14:26:42 -0000	1.16
+++ wireless-tools.spec	1 Apr 2005 15:37:08 -0000	1.17
@@ -1,12 +1,27 @@
+%define build_fc2                      1
+%define build_fc3                      0
+
+%if %{build_fc3}
+%define release_extension 1.0.fc2
+%endif
+
+%if %{build_fc3}
+%define release_extension 2.0.fc3
+%endif
+
+
 Summary: Wireless ethernet configuration tools
 Group: System Environment/Base
 License: GPL
 Name: wireless-tools
-Version: 26
-Release: 4
+Version: 27
+Release: 1.%{release_extension}
+Epoch: 1
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 Source: http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.%{version}.tar.gz
 Patch1: wireless-tools-25-makefile.patch
+Patch3: wireless-tools-27-atheros-abg-fix.patch
+Patch4: wireless-tools-27-loosen-version-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch: s390 s390x
 
@@ -18,7 +33,9 @@
 
 %prep
 %setup -n wireless_tools.%{version}
-%patch1 -p1
+%patch1 -p1 -b .makefile
+%patch3 -p1 -b .atheros-abg-fix
+%patch4 -p1 -b .loosen-version-check
 
 %build
 make clean
@@ -34,7 +51,7 @@
 	INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \
 	INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}
 rm -f $RPM_BUILD_ROOT/%{_lib}/libiw.a
-ln -sf ../../%{_lib}/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so
+ln -sf /%{_lib}/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,11 +64,33 @@
 %doc INSTALL README DISTRIBUTIONS.txt
 /sbin/*
 %{_mandir}/man*/*
-/%{_lib}/*.so.*
 %{_includedir}/*
 %{_libdir}/*.so
+/%{_lib}/*.so.*
 
 %changelog
+* Fri Apr  1 2005 Dan Williams <dcbw at redhat.com> 27-1
+- Update to final wireless-tools-27
+- loosen WEXT version check to suppress messages to console
+- wait longer for scan to finish for devices that need more
+	time to scan all their channels
+- Drop integrated scan leak patch
+
+* Wed Oct 27 2004 Dan Williams <dcbw at redhat.com> 27-0.pre25-3
+- Fix massive leak in iw_process_scan()
+
+* Mon Sep 27 2004 Rik van Riele <riel at redhat.com> 27-0.pre25-2
+- compile with RPM_OPT_FLAGS (bz#133651)
+
+* Tue Aug 31 2004 Bill Nottingham <notting at redhat.com> 27-0.pre25.1
+- update to 27.pre25
+
+* Wed Jun 23 2004 Dan Williams <dcbw at redhat.com>
+- Upgrade to 27.pre23 to get new wireless scanning API
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
 * Mon Mar 15 2004 Bill Nottingham <notting at redhat.com>
 - force wireless extensions to current (#115707)
 


