From c06c70e804b714093208c83f684021cb0cad752888c67da0a726f961b2b54c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Tue, 7 Feb 2012 10:00:23 +0000
Subject: [PATCH] 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
---
 crda.changes |  5 +++++
 crda.spec    | 26 ++++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/crda.changes b/crda.changes
index 3083dfc..e252549 100644
--- a/crda.changes
+++ b/crda.changes
@@ -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
 
diff --git a/crda.spec b/crda.spec
index 6a11768..90f3b55 100644
--- a/crda.spec
+++ b/crda.spec
@@ -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