Hello community,

here is the log from the commit of package wireless-tools for openSUSE:Factory 
checked in at 2013-02-15 18:53:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireless-tools (Old)
 and      /work/SRC/openSUSE:Factory/.wireless-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "wireless-tools", Maintainer is "mac...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/wireless-tools/wireless-tools.changes    
2012-07-09 13:42:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wireless-tools.new/wireless-tools.changes       
2013-02-15 18:53:12.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Feb 15 09:25:08 UTC 2013 - rmila...@suse.com
+
+- Move iwlwifi-led.sh to where udev is installed using pkg-config.
+  Apply the same thing also for 99-iwlwifi-led.rules (only 
+  openSUSE 12.3 and up).
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wireless-tools.spec ++++++
--- /var/tmp/diff_new_pack.k4UYIK/_old  2013-02-15 18:53:13.000000000 +0100
+++ /var/tmp/diff_new_pack.k4UYIK/_new  2013-02-15 18:53:13.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package wireless-tools
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,6 +21,11 @@
 License:        GPL-2.0
 Group:          Hardware/Wifi
 %define major_version 30
+%if %suse_version > 1220
+%define         _udevdir %(pkg-config --variable=udevdir udev)
+%else
+%define         _udevdir /lib/udev
+%endif
 Version:        %{major_version}.pre9
 Release:        0
 Url:            http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
@@ -38,7 +43,12 @@
 Source11:       iwlagn.modprobe
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  openssl-devel
+%if %suse_version > 1220
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(udev)
+%else
 BuildRequires:  udev
+%endif
 
 Requires:       libiw = %{version}
 
@@ -108,7 +118,7 @@
        DOCDIR=%{_defaultdocdir}/wireless-tools \
        PREFIX="${RPM_BUILD_ROOT}/usr" \
        install
-tar -xvvzf %{SOURCE2}
+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
@@ -119,10 +129,11 @@
 %ifarch %ix86 x86_64
 install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/50-prism54.conf
 %endif
-mkdir -p %{buildroot}/lib/udev
-install -m755 %{SOURCE8} %{buildroot}/lib/udev/iwlwifi-led.sh
+mkdir -p %{buildroot}%{_udevdir}
+install -m755 %{SOURCE8} %{buildroot}%{_udevdir}/iwlwifi-led.sh
 mkdir -p %{buildroot}/etc/udev/rules.d
 install -m644 %{SOURCE9} %{buildroot}/etc/udev/rules.d/99-iwlwifi-led.rules
+sed -i -e "s|@UDEVDIR@|%{_udevdir}|g" 
%{buildroot}/etc/udev/rules.d/99-iwlwifi-led.rules
 %find_lang %{name} --with-man --all-name
 
 %post -n libiw30 -p /sbin/ldconfig
@@ -135,7 +146,8 @@
 %{_sbindir}/*
 %config /etc/modprobe.d/*
 %doc CHANGELOG.h INSTALL PCMCIA.txt README*
-/lib/udev/iwlwifi-led.sh
+%{_udevdir}
+%{_udevdir}/iwlwifi-led.sh
 %dir %{_mandir}/cs
 %dir %{_mandir}/fr.ISO8859-1
 %dir %{_mandir}/fr.UTF-8

++++++ 99-iwlwifi-led.rules ++++++
--- /var/tmp/diff_new_pack.k4UYIK/_old  2013-02-15 18:53:13.000000000 +0100
+++ /var/tmp/diff_new_pack.k4UYIK/_new  2013-02-15 18:53:13.000000000 +0100
@@ -1,2 +1,2 @@
-SUBSYSTEM=="leds", ACTION=="add", KERNEL=="iwl-phy*:assoc", 
RUN+="/lib/udev/iwlwifi-led.sh"
+SUBSYSTEM=="leds", ACTION=="add", KERNEL=="iwl-phy*:assoc", 
RUN+="@UDEVDIR@/iwlwifi-led.sh"
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to