rpms/wireless-tools/devel .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 wireless-tools.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: caillon

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

Modified Files:
	.cvsignore sources wireless-tools.spec 
Log Message:
* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 1:28-1
- Update to the latest stable release
- Create -devel subpackage for headers



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Apr 2006 21:48:28 -0000	1.15
+++ .cvsignore	29 Aug 2006 23:20:20 -0000	1.16
@@ -1,2 +1 @@
-wireless_tools.28.pre13.tar.gz
-wireless_tools.28.pre16.tar.gz
+wireless_tools.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 21:48:28 -0000	1.15
+++ sources	29 Aug 2006 23:20:20 -0000	1.16
@@ -1 +1 @@
-abccc8bc09e1324af702b58adb6eda18  wireless_tools.28.pre16.tar.gz
+599c94497f9c9073c7b052d3dcb7cd16  wireless_tools.28.tar.gz


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wireless-tools.spec	12 Jul 2006 08:48:48 -0000	1.33
+++ wireless-tools.spec	29 Aug 2006 23:20:20 -0000	1.34
@@ -1,30 +1,6 @@
-%define pre_version pre16
-%define pre_release 1
-
-%define build_fc3			0
-%define build_rhel4			0
-%define build_fc4			0
-%define build_fc5			0
-%define build_fc6			1
-
-%if %{build_fc3}
-%define release_extension 1.fc3
-%endif
-
-%if %{build_rhel4}
-%define release_extension 3.EL4
-%endif
-
-%if %{build_fc4}
-%define release_extension 4.fc4
-%endif
-
-%if %{build_fc5}
-%define release_extension 5.fc5
-%endif
-
-%if %{build_fc6}
-%define release_extension 6
+%define pre_release 0
+%if %{pre_release}
+%define pre_version .pre16
 %endif
 
 Summary: Wireless ethernet configuration tools
@@ -32,10 +8,10 @@
 License: GPL
 Name: wireless-tools
 Version: 28
-Release: 0.%{pre_version}.%{pre_release}.%{release_extension}.1
+Release: 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
+Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}%{?pre_version}.tar.gz
 Patch1: wireless-tools-28-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch: s390 s390x
@@ -44,9 +20,25 @@
 This package contain the Wireless tools, used to manipulate
 the Wireless Extensions. The Wireless Extension is an interface
 allowing you to set Wireless LAN specific parameters and get the
-specific stats for wireless networking equipment. 
+specific stats for wireless networking equipment.
+
+%package devel
+Summary: Development headers for the wireless-tools package
+Group: Development/Libraries
+Requires: wireless-tools = %{epoch}:%{version}-%{release}
+
+%description devel
+Development headers for the wireless-tools package.
+
 
 %prep
+%if %{pre_release}
+if [ "$(echo %{release} | sed -e 's/\..*$//')" -ne "0" ]; then
+  echo "*** The Release: value for a pre-release version must be less than 1. ***"
+  exit 1
+fi
+%endif
+
 %setup -n wireless_tools.%{version}
 %patch1 -p1 -b .makefile
 
@@ -55,33 +47,41 @@
 make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1 FORCE_WEXT_VERSION=16
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT{/sbin,/%{_lib},%{_mandir}/man8,%{_includedir},%{_libdir}}
+%{__mkdir_p} $RPM_BUILD_ROOT{/sbin,/%{_lib},%{_mandir}/man8,%{_includedir},%{_libdir}}
 
 make install INSTALL_DIR=$RPM_BUILD_ROOT/sbin \
 	INSTALL_LIB=$RPM_BUILD_ROOT/%{_lib} \
 	INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \
 	INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT/%{_lib}/libiw.{a,so}
+%{__rm} -f $RPM_BUILD_ROOT/%{_lib}/libiw.{a,so}
 ln -sf /%{_lib}/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc INSTALL README DISTRIBUTIONS.txt
 /sbin/*
 %{_mandir}/man*/*
+/%{_lib}/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
-/%{_lib}/*.so.*
+
 
 %changelog
+* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 1:28-1
+- Update to the latest stable release
+- Create -devel subpackage for headers
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:28-0.pre16.1.6.1
 - rebuild