Compare commits

..

No commits in common. "rawhide" and "f26" have entirely different histories.

3 changed files with 56 additions and 77 deletions

View file

@ -0,0 +1,46 @@
From bb522bd584f05e6658d5dba97f48ca018f46394c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 6 May 2017 14:36:08 +0200
Subject: [PATCH] src/nl_extras.h: fix compatibility with libnl 3.3.0
nl_extras.h defines a set of nla_set_s*() functions if not provided by
libnl. They are provided by libnl since version 3.2.26. The test
(LIBNL_VER_MIC <= 26) was working fine while libnl was in the 3.2.x
series, but now that they have incremented the minor version, the
micro version was reset to 0, with the latest libnl version being
3.3.0.
Due to this, the condition (LIBNL_VER_MIC <= 26) is true, and we get
redefinition errors because nl_extras.h redefines functions already
provided by libnl.
This commit improves the condition so that nl_extras.h provides the
missing functions only if the minor version is < 2, or if minor is 2
and micro is < 26.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
src/nl_extras.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nl_extras.h b/src/nl_extras.h
index c4d1d14..37844f9 100644
--- a/src/nl_extras.h
+++ b/src/nl_extras.h
@@ -1,7 +1,7 @@
#ifndef __NL_EXTRAS_H
#define __NL_EXTRAS_H
-#if LIBNL_VER_MIC <= 26
+#if (LIBNL_VER_MIN < 2) || (LIBNL_VER_MIN == 2) && (LIBNL_VER_MIC <= 26)
#ifndef NLA_S8
@@ -45,6 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla)
#endif /* NLA_S64 */
-#endif /* LIBNL_VER_MIC */
+#endif /* LIBNL_VER_* */
#endif /* __NL_EXTRAS_H */

View file

@ -1 +1 @@
SHA512 (wpan-tools-0.10.tar.xz) = 2a25e85aa3a0fc5ee1cc5e20a5e5d45eba282a2c2e85be21ed7cf229d7fa032bb45c7dafe5dba8838f179b52e2a3a1cb943db19aff4c391f9005d403d202dfc3
91f0b640ff66910e977fab6525625624 wpan-tools-0.7.tar.xz

View file

@ -1,107 +1,40 @@
Name: wpan-tools
Version: 0.10
Version: 0.7
Release: 5%{?dist}
Summary: Userspace tools for the Linux IEEE 802.15.4 stack
License: ISC
URL: https://github.com/linux-wpan/wpan-tools/
URL: https://github.com/linux-wpan/
Source0: %{url}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
Source0: http://wpan.cakelab.org/releases/%{name}-%{version}.tar.xz
Patch1: fix-build-with-libbl-33.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: libnl3-devel
BuildRequires: libtool autoconf automake
%description
Userspace tools for the Linux IEEE 802.15.4 stack.
%prep
%autosetup -p1
%setup -q
%patch1 -p1 -b .nl3
%build
%configure --disable-static
%make_build
make %{?_smp_mflags} V=1
%install
%make_install
make install DESTDIR=%{buildroot} INSTALL='install -p'
%check
make %{?_smp_mflags} check
%files
%license COPYING
%doc wpan-ping/README.wpan-ping
%{_bindir}/iwpan
%{_bindir}/wpan-ping
%{_bindir}/wpan-hwsim
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jan 11 2025 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10-1
- Update to 0.10
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Dec 24 2018 Peter Robinson <pbrobinson@fedoraproject.org> 0.9-1
- Update to 0.9
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Mar 9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 0.8-2
- Add gcc BR
* Sun Feb 11 2018 Peter Robinson <pbrobinson@fedoraproject.org> 0.8-1
- Update to 0.8
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Aug 7 2017 Peter Robinson <pbrobinson@fedoraproject.org> 0.7-5
- Fix FTBFS with libnl 3.3