Hello community, here is the log from the commit of package wireless-tools for openSUSE:Factory checked in at 2018-01-30 15:39:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireless-tools (Old) and /work/SRC/openSUSE:Factory/.wireless-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireless-tools" Tue Jan 30 15:39:21 2018 rev:48 rq:570627 version:30.pre9 Changes: -------- --- /work/SRC/openSUSE:Factory/wireless-tools/wireless-tools.changes 2014-11-24 11:10:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wireless-tools.new/wireless-tools.changes 2018-01-30 15:39:23.568641119 +0100 @@ -1,0 +2,13 @@ +Mon Jan 22 11:25:21 UTC 2018 - [email protected] + +- improved install scripts (using install instead of mv and using $UID: + * install_acx100_firmware + * install_intersil_firmware +- updated URL in install_acx100_firmware script (bnc#1004577) +- improved spec file + * removed obsolete openSUSE Versions checks + * replaced bash variables with macros + * removed obsolete tags and macros + * cleaned spec file with spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-tools.spec ++++++ --- /var/tmp/diff_new_pack.vThdzh/_old 2018-01-30 15:39:24.420601343 +0100 +++ /var/tmp/diff_new_pack.vThdzh/_new 2018-01-30 15:39:24.424601156 +0100 @@ -1,7 +1,7 @@ # # spec file for package wireless-tools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,16 @@ # +%define _udevdir %(pkg-config --variable=udevdir udev) + Name: wireless-tools +Version: 30.pre9 +Release: 0 Summary: Tools for a wireless LAN License: GPL-2.0 Group: Hardware/Wifi -%if %suse_version > 1220 -%define _udevdir %(pkg-config --variable=udevdir udev) -%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d} -%else -%define _udevdir /lib/udev -%define _udevrulesdir %{_udevdir}/rules.d -%endif -Version: 30.pre9 -Release: 0 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}.tar.gz -Patch: wireless_tools.dif -Patch1: lwepgen-as-needed.patch Source2: suse-files.tar.gz Source4: ipw2200.modprobe Source5: prism54.modprobe @@ -40,16 +33,12 @@ Source8: iwlwifi-led.sh Source9: 99-iwlwifi-led.rules Source10: iwl3945.modprobe -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: wireless_tools.dif +Patch1: lwepgen-as-needed.patch BuildRequires: openssl-devel -%if %suse_version > 1220 +Requires: libiw = %{version} BuildRequires: pkgconfig BuildRequires: pkgconfig(udev) -%else -BuildRequires: udev -%endif - -Requires: libiw = %{version} %package -n libiw30 Summary: Tools for a wireless LAN @@ -58,7 +47,7 @@ %package -n libiw-devel Summary: Tools for a wireless LAN -Group: Hardware/Wifi +Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libiw30 = %{version} @@ -67,66 +56,46 @@ wireless extensions. The wireless extension is an interface that allows you to set wireless LAN specific parameters and get specific stats. - - -Authors: --------- - Jean Tourrilhes <[email protected]> - %description -n libiw30 This package contains the wireless tools, used to manipulate the wireless extensions. The wireless extension is an interface that allows you to set wireless LAN specific parameters and get specific stats. - - -Authors: --------- - Jean Tourrilhes <[email protected]> - %description -n libiw-devel This package contains the wireless tools, used to manipulate the wireless extensions. The wireless extension is an interface that allows you to set wireless LAN specific parameters and get specific stats. - - -Authors: --------- - Jean Tourrilhes <[email protected]> - %prep -%setup6 -q -T -b 6 -n lwepgen +%setup -q -T -b 6 -n lwepgen %setup -q -n wireless_tools.30 -%patch +%patch0 pushd ../lwepgen %patch1 popd %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" -C ../lwepgen +make %{?_smp_mflags} CFLAGS="%{optflags}" +make %{?_smp_mflags} CFLAGS="%{optflags}" -C ../lwepgen %install -mkdir -p %{buildroot}/%{_sbindir} -mkdir -p %{buildroot}/sbin -make INSTALL_DIR="${RPM_BUILD_ROOT}/%{_sbindir}" \ - INSTALL_INC="${RPM_BUILD_ROOT}/%{_includedir}" \ - INSTALL_LIB="${RPM_BUILD_ROOT}/%{_libdir}" \ - INSTALL_MAN="${RPM_BUILD_ROOT}/%{_mandir}" \ +make INSTALL_DIR="%{buildroot}/%{_sbindir}" \ + INSTALL_INC="%{buildroot}/%{_includedir}" \ + INSTALL_LIB="%{buildroot}/%{_libdir}" \ + INSTALL_MAN="%{buildroot}/%{_mandir}" \ DOCDIR=%{_defaultdocdir}/wireless-tools \ - PREFIX="${RPM_BUILD_ROOT}/usr" \ + PREFIX="%{buildroot}%{_prefix}" \ install + tar -xvzf %{SOURCE2} -install -m755 install_intersil_firmware %{buildroot}/usr/sbin -install -m755 install_acx100_firmware %{buildroot}/usr/sbin -install -m755 ../lwepgen/lwepgen %{buildroot}/usr/sbin -mkdir -p %{buildroot}/etc/modprobe.d -install -m644 %{SOURCE4} %{buildroot}/etc/modprobe.d/50-ipw2200.conf -install -m644 %{SOURCE10} %{buildroot}/etc/modprobe.d/50-iwl3945.conf -%ifarch %ix86 x86_64 -install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/50-prism54.conf -%endif +install -m755 install_intersil_firmware %{buildroot}%{_sbindir} +install -m755 install_acx100_firmware %{buildroot}%{_sbindir} +install -m755 ../lwepgen/lwepgen %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d +install -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/modprobe.d/50-ipw2200.conf +install -m644 %{SOURCE10} %{buildroot}%{_sysconfdir}/modprobe.d/50-iwl3945.conf +install -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/modprobe.d/50-prism54.conf + mkdir -p %{buildroot}%{_udevdir} install -m755 %{SOURCE8} %{buildroot}%{_udevdir}/iwlwifi-led.sh mkdir -p %{buildroot}%{_udevrulesdir} @@ -135,29 +104,25 @@ %find_lang %{name} --with-man --all-name %post -n libiw30 -p /sbin/ldconfig - %postun -n libiw30 -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-,root,root) -%dir /etc/modprobe.d +%doc CHANGELOG.h PCMCIA.txt README* +%dir %{_sysconfdir}/modprobe.d %{_sbindir}/* -%config /etc/modprobe.d/* -%doc CHANGELOG.h INSTALL PCMCIA.txt README* +%config %{_sysconfdir}/modprobe.d/* %{_udevdir} %{_udevdir}/iwlwifi-led.sh %dir %{_mandir}/cs %dir %{_mandir}/fr.ISO8859-1 %dir %{_mandir}/fr.UTF-8 -%{_mandir}/man?/*.gz +%{_mandir}/man?/*%{ext_man} %{_udevrulesdir}/99-iwlwifi-led.rules %files -n libiw30 -%defattr(-,root,root) %{_libdir}/libiw.so.* %files -n libiw-devel -%defattr(-,root,root) %{_libdir}/libiw.so %{_includedir}/iwlib.h %{_includedir}/wireless.h ++++++ suse-files.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/install_acx100_firmware new/install_acx100_firmware --- old/install_acx100_firmware 2014-10-18 20:40:02.442119504 +0200 +++ new/install_acx100_firmware 2018-01-22 12:05:42.344092020 +0100 @@ -4,8 +4,8 @@ # # This script tries to download and install the firmware needed to run # WLAN cards using the ACX100 chip. -URL="ftp://ftp.dlink.com/Wireless/dwl520+/Driver"; -FWFILE="dwl520+_drivers_307.zip" +URL="ftp://ftp2.dlink.com/PRODUCTS/DWL-520PLUS/REVA/"; +FWFILE="DWL-520PLUS_DRIVER_3.07_WIN.ZIP" die() { @@ -32,8 +32,7 @@ exit 1 } -WHO=`id -u` -test "${WHO}" = "0" || { echo "You have to be root to do this!"; exit 1; } +test "${UID}" = "0" || { echo "You have to be root to do this!"; exit 1; } test -z "$( type -p curl)" && { echo "'curl' is not installed, aborting"; exit 1; } test -z "$( type -p unzip)" && { echo "'unzip' is not installed, aborting"; exit 1; } test -d /lib/firmware || mkdir -p /lib/firmware @@ -44,10 +43,10 @@ echo "Downloading firmware" curl -# -o ${FWFILE} ${URL}/${FWFILE} echo -n "Installing firmware" -unzip dwl520+_drivers_307.zip >/dev/null || die -mv Drivers/Win2000/WLANGEN.bin /lib/firmware/WLANGEN.BIN || die -mv Drivers/Win2000/RADIO0d.BIN /lib/firmware/ || die -mv Drivers/Win2000/RADIO11.BIN /lib/firmware/ || die +unzip $FWFILE >/dev/null || die +install -m0644 Drivers/Win2000/WLANGEN.bin /lib/firmware/WLANGEN.BIN || die +install -m0644 Drivers/Win2000/RADIO0d.BIN /lib/firmware/RADIO0d.BIN || die +install -m0644 Drivers/Win2000/RADIO11.BIN /lib/firmware/RADIO11.BIN || die echo echo "Firmware successfully installed." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/install_intersil_firmware new/install_intersil_firmware --- old/install_intersil_firmware 2014-10-18 21:27:39.767926205 +0200 +++ new/install_intersil_firmware 2018-01-22 12:05:27.511948902 +0100 @@ -32,8 +32,7 @@ exit 1 } -WHO=`id -u` -test "${WHO}" = "0" || { echo "You have to be root to do this!"; exit 1; } +test "${UID}" = "0" || { echo "You have to be root to do this!"; exit 1; } test -z "$( type -p curl)" && { echo "'curl' is not installed, aborting"; exit 1; } test -z "$( type -p unzip)" && { echo "'unzip' is not installed, aborting"; exit 1; } test -d /lib/firmware || mkdir -p /lib/firmware @@ -45,7 +44,7 @@ curl -# -o $FWFILE $URL/$FWFILE || curldie echo -n "Installing firmware" unzip $FWFILE >/dev/null || die -mv ComCard\ 54g/Win2k/WLANDCB.arm /lib/firmware/isl3890 || die +install -m0644 ComCard\ 54g/Win2k/WLANDCB.arm /lib/firmware/isl3890 || die echo echo "Firmware successfully installed."
