From 453ae342fcdc5f0792a322cffb277ed4028074e285f960672f749e166e61746a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 10 Feb 2016 08:02:25 +0000 Subject: [PATCH 1/2] Accepting request 358623 from home:pluskalm:branches:hardware - Update to 2016.02.08 OBS-URL: https://build.opensuse.org/request/show/358623 OBS-URL: https://build.opensuse.org/package/show/hardware/wireless-regdb?expand=0&rev=36 --- wireless-regdb-2015.12.14.tar.xz | 3 --- wireless-regdb-2016.02.08.tar.xz | 3 +++ wireless-regdb.changes | 5 +++++ wireless-regdb.spec | 8 ++++---- 4 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 wireless-regdb-2015.12.14.tar.xz create mode 100644 wireless-regdb-2016.02.08.tar.xz diff --git a/wireless-regdb-2015.12.14.tar.xz b/wireless-regdb-2015.12.14.tar.xz deleted file mode 100644 index 97d7254..0000000 --- a/wireless-regdb-2015.12.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:013e07d988f5cd7d24e4aa7a6cd406615d441ea6b882a02d2a46a78edeb2cfb6 -size 15712 diff --git a/wireless-regdb-2016.02.08.tar.xz b/wireless-regdb-2016.02.08.tar.xz new file mode 100644 index 0000000..ccfa7ac --- /dev/null +++ b/wireless-regdb-2016.02.08.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce957b7f4fe103d8fb4d160d3b39825ad0b0da639b7453d4022d71415b6c9f9f +size 15800 diff --git a/wireless-regdb.changes b/wireless-regdb.changes index 9ebf26d..23ffa8d 100644 --- a/wireless-regdb.changes +++ b/wireless-regdb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 9 21:51:01 UTC 2016 - mpluskal@suse.com + +- Update to 2016.02.08 + ------------------------------------------------------------------- Tue Dec 22 13:11:55 UTC 2015 - mpluskal@suse.com diff --git a/wireless-regdb.spec b/wireless-regdb.spec index 2130933..712e496 100644 --- a/wireless-regdb.spec +++ b/wireless-regdb.spec @@ -1,7 +1,7 @@ # # spec file for package wireless-regdb # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: wireless-regdb -Version: 2015.12.14 +Version: 2016.02.08 Release: 0 Summary: 802.11 regulatory domain database License: ISC @@ -37,7 +37,7 @@ allowed frequency ranges for 802.11 wireless drivers. %build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install %files %defattr(-,root,root) @@ -45,6 +45,6 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %dir %{_libexecdir}/crda/pubkeys %{_libexecdir}/crda/regulatory.bin %{_libexecdir}/crda/pubkeys/*pem -%{_mandir}/man5/regulatory.bin.5.gz +%{_mandir}/man5/regulatory.bin.5%{ext_man} %changelog From 4a7db06c8c959c53d9a25ece2ebc8be00f0e2b9b29fedbf678e83a171f4292c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 13 Feb 2016 16:32:28 +0000 Subject: [PATCH 2/2] Accepting request 359183 from home:a_faerber:branches:hardware Fix SLE11 builds OBS-URL: https://build.opensuse.org/request/show/359183 OBS-URL: https://build.opensuse.org/package/show/hardware/wireless-regdb?expand=0&rev=37 --- wireless-regdb.changes | 6 ++++++ wireless-regdb.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/wireless-regdb.changes b/wireless-regdb.changes index 23ffa8d..84811f7 100644 --- a/wireless-regdb.changes +++ b/wireless-regdb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 13 10:36:18 UTC 2016 - afaerber@suse.de + +- Explicitly require xz, fixing tar errors for SLE11 builds +- Work around a mismatch of lib vs. lib64 on SLE11 x86_64 + ------------------------------------------------------------------- Tue Feb 9 21:51:01 UTC 2016 - mpluskal@suse.com diff --git a/wireless-regdb.spec b/wireless-regdb.spec index 712e496..ac339e1 100644 --- a/wireless-regdb.spec +++ b/wireless-regdb.spec @@ -24,6 +24,7 @@ License: ISC Group: Hardware/Wifi Url: http://wireless.kernel.org/en/developers/Regulatory#The_regulatory_database Source: https://www.kernel.org/pub/software/network/wireless-regdb/%{name}-%{version}.tar.xz +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -31,6 +32,11 @@ BuildArch: noarch The 802.11 regulatory domain database is used by CRDA and provides allowed frequency ranges for 802.11 wireless drivers. +%if 0%{?suse_version} == 1110 +# _libexecdir points to /usr/lib64 for SLE11 +%define _libexecdir %{_prefix}/lib +%endif + %prep %setup -q