rpms/wireless-tools/devel wireless-tools-29-makefile.patch, NONE, 1.1 wireless-tools.spec, 1.36, 1.37 wireless-tools-28-makefile.patch, 1.1, NONE wireless-tools-28-sscanf-64bit-fixes.patch, 1.1, NONE

Christopher Aillon (caillon) fedora-extras-commits at redhat.com
Tue May 22 21:43:04 UTC 2007


Author: caillon

Update of /cvs/extras/rpms/wireless-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943

Modified Files:
	wireless-tools.spec 
Added Files:
	wireless-tools-29-makefile.patch 
Removed Files:
	wireless-tools-28-makefile.patch 
	wireless-tools-28-sscanf-64bit-fixes.patch 
Log Message:
* Tue May 22 2007 Christopher Aillon <caillon at redhat.com> - 1:29-0.1.pre21
- Update to 29pre21


wireless-tools-29-makefile.patch:

--- NEW FILE wireless-tools-29-makefile.patch ---
--- wireless_tools.29/Makefile.makefile	2007-04-19 19:42:23.000000000 -0400
+++ wireless_tools.29/Makefile	2007-05-22 17:31:53.000000000 -0400
@@ -101,12 +101,15 @@ ifdef BUILD_WE_ESSENTIAL
   WEDEF_FLAG= -DWE_ESSENTIAL=y
 endif
 
+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) $(WEDEF_FLAG)
+XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG) $(OPT_FLAGS)
 PICFLAG=-fPIC
 
 # Standard compilation targets
@@ -146,6 +149,7 @@ wireless.h:
 # Compilation of the dynamic library
 $(DYNAMIC): $(OBJS:.o=.so)
 	$(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^
+	ln -s $@ $(DYNAMIC_LINK)
 
 # Compilation of the static library
 $(STATIC): $(OBJS:.o=.so)


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wireless-tools.spec	14 May 2007 12:14:41 -0000	1.36
+++ wireless-tools.spec	22 May 2007 21:42:29 -0000	1.37
@@ -1,19 +1,18 @@
-%define pre_release 0
+%define pre_release 1
 %if %{pre_release}
-%define pre_version .pre16
+%define pre_version .pre21
 %endif
 
 Summary: Wireless ethernet configuration tools
 Group: System Environment/Base
 License: GPL
 Name: wireless-tools
-Version: 28
-Release: 3%{?pre_version}%{?dist}
+Version: 29
+Release: 0.1%{?pre_version}%{?dist}
 Epoch: 1
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}%{?pre_version}.tar.gz
-Patch1: wireless-tools-28-makefile.patch
-Patch2: wireless-tools-28-sscanf-64bit-fixes.patch
+Patch1: wireless-tools-29-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch: s390 s390x
 
@@ -42,7 +41,6 @@
 
 %setup -n wireless_tools.%{version}
 %patch1 -p1 -b .makefile
-%patch2 -p1 -b .sscanf-64bit-fixes
 
 %build
 make clean
@@ -80,6 +78,9 @@
 
 
 %changelog
+* Tue May 22 2007 Christopher Aillon <caillon at redhat.com> - 1:29-0.1.pre21
+- Update to 29pre21
+
 * Mon May 14 2007 Christopher Aillon <caillon at redhat.com> - 1:28-3
 - Only the sscanf fixes this time.
 


--- wireless-tools-28-makefile.patch DELETED ---


--- wireless-tools-28-sscanf-64bit-fixes.patch DELETED ---




More information about the fedora-extras-commits mailing list