Hello community, here is the log from the commit of package usb_modeswitch for openSUSE:Factory checked in at 2012-10-25 12:12:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usb_modeswitch (Old) and /work/SRC/openSUSE:Factory/.usb_modeswitch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "usb_modeswitch", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/usb_modeswitch/usb_modeswitch.changes 2012-10-03 10:13:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.usb_modeswitch.new/usb_modeswitch.changes 2012-10-25 12:12:05.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Oct 17 13:31:34 UTC 2012 - [email protected] + +- Fix build with new udev directory location + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usb_modeswitch.spec ++++++ --- /var/tmp/diff_new_pack.sDsOUh/_old 2012-10-25 12:12:06.000000000 +0200 +++ /var/tmp/diff_new_pack.sDsOUh/_new 2012-10-25 12:12:06.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package usb_modeswitch (Version 1.1.6) +# spec file for package usb_modeswitch # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,16 +16,21 @@ # +%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%define _udevdir /usr/lib/udev/ +%else +%define _udevdir /lib/udev/ +%endif Name: usb_modeswitch Version: 1.2.3 Release: 0 Summary: A mode switching tool for controlling multiple-device USB gear +License: GPL-2.0+ Group: Hardware/Mobile Url: http://www.draisberghof.de/usb_modeswitch %define source_name usb-modeswitch %define date 20120531 -License: GPL-2.0+ Source0: http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2 Source1: %{source_name}-data-%{date}.tar.bz2 Source2: %{name}-data.rpmlintrc @@ -33,9 +38,9 @@ Patch0: add_alcatel_ot_x220d.patch Patch1: huawei-timing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes BuildRequires: libusb-devel BuildRequires: tcl -BuildRequires: fdupes BuildRequires: udev Requires: /bin/eject Requires: tcl >= 8.4 @@ -54,7 +59,6 @@ Josua Dietze and others %package data -License: GPL-2.0+ Summary: Data Files for USB Modeswitch Group: Hardware/Mobile Requires: %{name} = %{version} @@ -72,10 +76,10 @@ CFLAGS="%{optflags}" make %install -%makeinstall +%makeinstall UDEVDIR=$RPM_BUILD_ROOT%{_udevdir} cd %{source_name}-data-%{date} cp %{SOURCE3} . -%makeinstall +%makeinstall RULESDIR=$RPM_BUILD_ROOT%{_udevdir}/rules.d %fdupes -s $RPM_BUILD_ROOT %files @@ -83,7 +87,7 @@ %doc README COPYING ChangeLog %{_sbindir}/usb_modeswitch %{_sbindir}/usb_modeswitch_dispatcher -/lib/udev/usb_modeswitch +%{_udevdir}/usb_modeswitch /var/lib/usb_modeswitch %config %{_sysconfdir}/usb_modeswitch.conf %{_mandir}/man1/usb_modeswitch.1.gz @@ -91,6 +95,6 @@ %files data %defattr(-,root,root,-) %_datadir/usb_modeswitch/ -/lib/udev/rules.d/40-usb_modeswitch.rules +%{_udevdir}/rules.d/40-usb_modeswitch.rules %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
