Accepting request 102719 from home:rjschwei:branches:hardware

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/102719
OBS-URL: https://build.opensuse.org/package/show/hardware/crda?expand=0&rev=12
This commit is contained in:
Ismail Dönmez 2012-02-07 10:00:23 +00:00 committed by Git OBS Bridge
parent 320d08d065
commit c06c70e804
2 changed files with 25 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 4 15:37:28 UTC 2012 - rschweikert@suse.com
- put files in /usr tree (UsrMerge project)
-------------------------------------------------------------------
Sat Sep 17 23:59:07 UTC 2011 - jengelh@medozas.de

View File

@ -1,7 +1,7 @@
#
# spec file for package crda
#
# 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
@ -20,13 +20,19 @@ Url: http://linuxwireless.org/en/developers/Regulatory/CRDA
Name: crda
Summary: 802.11 central regulatory domain agent
Version: 1.1.1
Release: 1
License: BSD-3-Clause
Group: Hardware/Wifi
License: BSD3c(or similar)
Version: 1.1.1
Release: 0
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libgcrypt-devel libnl-1_1-devel pkg-config python python-m2crypto udev wireless-regdb
BuildRequires: libgcrypt-devel
BuildRequires: libnl-1_1-devel
BuildRequires: pkg-config
BuildRequires: python
BuildRequires: python-m2crypto
BuildRequires: udev
BuildRequires: wireless-regdb
Requires: wireless-regdb
Supplements: kernel >= 2.6.29
@ -41,12 +47,20 @@ through udev.
make all_noverify %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} install
#UsrMerge
mkdir $RPM_BUILD_ROOT/sbin
ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin
#EndUserMerge
%files
%defattr(-,root,root)
%_sbindir/crda
%_sbindir/regdbdump
#UsrMerge
/sbin/crda
/sbin/regdbdump
#EndUserMerge
/lib/udev/rules.d/85-regulatory.rules
/usr/share/man/man8/crda.8.gz
/usr/share/man/man8/regdbdump.8.gz