pool/usb_modeswitch
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 139185 from hardware

Browse Source 
Fix build with new udev directory location (forwarded request 138922 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/139185
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/usb_modeswitch?expand=0&rev=21
This commit is contained in:
Ismail Dönmez 2012-10-25 10:12:02 +00:00 committed by Git OBS Bridge
commit c8b82fe1d4
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usb_modeswitch.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 17 13:31:34 UTC 2012 - fcrozat@suse.com
- Fix build with new udev directory location
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 28 12:59:57 UTC 2012 - gschlotter@suse.com Fri Sep 28 12:59:57 UTC 2012 - gschlotter@suse.com

28
usb_modeswitch.spec
View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,26 +16,31 @@
# #
%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190
%define _udevdir /usr/lib/udev/
%else
%define _udevdir /lib/udev/
%endif
Name: usb_modeswitch Name: usb_modeswitch
Version: 1.2.3 Version: 1.2.3
Release: 0 Release: 0
Summary: A mode switching tool for controlling multiple-device USB gear Summary: A mode switching tool for controlling multiple-device USB gear
License: GPL-2.0+
Group: Hardware/Mobile Group: Hardware/Mobile
Url: http://www.draisberghof.de/usb_modeswitch Url: http://www.draisberghof.de/usb_modeswitch
%define source_name usb-modeswitch %define source_name usb-modeswitch
%define date 20120531 %define date 20120531
License: GPL-2.0+
Source0: http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2 Source0: http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2
Source1: %{source_name}-data-%{date}.tar.bz2 Source1: %{source_name}-data-%{date}.tar.bz2
Source2: %{name}-data.rpmlintrc Source2: %{name}-data.rpmlintrc
Source3: 1bbb:f017 Source3: 1bbb:f017
Patch0: add_alcatel_ot_x220d.patch Patch0: add_alcatel_ot_x220d.patch
Patch1: huawei-timing.patch Patch1: huawei-timing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libusb-devel
BuildRequires: tcl
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libusb-devel
BuildRequires: tcl
BuildRequires: udev BuildRequires: udev
Requires: /bin/eject Requires: /bin/eject
Requires: tcl >= 8.4 Requires: tcl >= 8.4
@ -54,7 +59,6 @@ Authors:
Josua Dietze and others Josua Dietze and others
%package data %package data
License: GPL-2.0+
Summary: Data Files for USB Modeswitch Summary: Data Files for USB Modeswitch
Group: Hardware/Mobile Group: Hardware/Mobile
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -72,10 +76,10 @@ Data files for usb_modeswitch package.
CFLAGS="%{optflags}" make CFLAGS="%{optflags}" make
%install %install
%makeinstall %makeinstall UDEVDIR=$RPM_BUILD_ROOT%{_udevdir}
cd %{source_name}-data-%{date} cd %{source_name}-data-%{date}
cp %{SOURCE3} . cp %{SOURCE3} .
%makeinstall %makeinstall RULESDIR=$RPM_BUILD_ROOT%{_udevdir}/rules.d
%fdupes -s $RPM_BUILD_ROOT %fdupes -s $RPM_BUILD_ROOT
%files %files
@ -83,7 +87,7 @@ cp %{SOURCE3} .
%doc README COPYING ChangeLog %doc README COPYING ChangeLog
%{_sbindir}/usb_modeswitch %{_sbindir}/usb_modeswitch
%{_sbindir}/usb_modeswitch_dispatcher %{_sbindir}/usb_modeswitch_dispatcher
/lib/udev/usb_modeswitch %{_udevdir}/usb_modeswitch
/var/lib/usb_modeswitch /var/lib/usb_modeswitch
%config %{_sysconfdir}/usb_modeswitch.conf %config %{_sysconfdir}/usb_modeswitch.conf
%{_mandir}/man1/usb_modeswitch.1.gz %{_mandir}/man1/usb_modeswitch.1.gz
@ -91,6 +95,6 @@ cp %{SOURCE3} .
%files data %files data
%defattr(-,root,root,-) %defattr(-,root,root,-)
%_datadir/usb_modeswitch/ %_datadir/usb_modeswitch/
/lib/udev/rules.d/40-usb_modeswitch.rules %{_udevdir}/rules.d/40-usb_modeswitch.rules
%changelog %changelog