[packages/lldpad] - updated to 1.1.1

Tue Aug 12 20:28:34 CEST 2025

commit a3edd67b89e71bb1a4b9d6c7e52ff21f05bb0bfb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Aug 12 20:30:49 2025 +0200

    - updated to 1.1.1

 lldpad.spec           | 65 +++++++++++++++++++++++++++------------------------
 systemd-in-roor.patch | 31 +++++++-----------------
 2 files changed, 44 insertions(+), 52 deletions(-)
---

diff --git a/lldpad.spec b/lldpad.spec
index 47025b3..af0fc72 100644
--- a/lldpad.spec
+++ b/lldpad.spec
@@ -1,28 +1,29 @@
 Summary:	Intel LLDP Agent
 Summary(pl.UTF-8):	Agent LLDP firmy Intel
 Name:		lldpad
-Version:	1.0.1
-Release:	2
+Version:	1.1.1
+Release:	1
 License:	GPL v2
 Group:		Daemons
-# git://www.open-lldp.org/open-lldp.git
-Source0:	%{name}-%{version}.tar.xz
-# Source0-md5:	602088dcb826d0b7966eafe2c082fe46
+Source0:	https://github.com/intel/openlldp/archive/v%{version}/openlldp-%{version}.tar.gz
+# Source0-md5:	7d5ff2233cd8ee26c8124f4b741d6acb
 Patch0:		systemd-in-roor.patch
-URL:		http://open-lldp.org/
-BuildRequires:	autoconf
+URL:		https://github.com/intel/openlldp
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	flex >= 2.5.33
-BuildRequires:	kernel-headers >= 2.6.32
+BuildRequires:	linux-libc-headers >= 2.6.32
 BuildRequires:	libconfig-devel >= 1.3.2
-BuildRequires:	libnl-devel
-BuildRequires:	libtool
+BuildRequires:	libnl-devel >= 3.2
+BuildRequires:	libtool >= 2:2
+BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.647
-BuildRequires:	systemd
-Requires:	readline
+BuildRequires:	rpmbuild(macros) >= 1.673
+BuildRequires:	systemd-devel
 Requires(post,preun,postun):	systemd-units >= 38
-Requires:	systemd-units >= 0.38
+Requires:	iproute2-tc >= 2.6.29
+Requires:	systemd-units >= 38
+Requires:	uname(release) >= 2.6.29
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,29 +37,28 @@ narzędzie konfiguracyjne agenta LLDP firmy Intel z obsługą Enhanced
 Ethernet dla DC.
 
 %package devel
-Summary:	Development files for %{name}
-Summary(pl.UTF-8):	Pliki programistyczne %{name}
+Summary:	Development files for LLDP Agent and its communication library
+Summary(pl.UTF-8):	Pliki programistyczne agenta LLDP i jego biblioteki komunikacyjnej
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package contains header files for developing applications that
-use %{name}.
+use LLDP Agent.
 
 %description devel -l pl.UTF-8
 Ten pakiet zawiera pliki nagłówkowe to tworzenia aplikacji
-wykorzystujących %{name}.
+wykorzystujących agenta LLDP.
 
 %prep
-%setup -q
+%setup -q -n openlldp-%{version}
 %patch -P0 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-export CFLAGS="%{rpmcflags} -Wno-error"
 %configure \
 	--disable-static
 
@@ -66,10 +66,11 @@ export CFLAGS="%{rpmcflags} -Wno-error"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
+install -d $RPM_BUILD_ROOT/var/lib/lldpad
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	bashcompletiondir=%{bash_compdir}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -78,10 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-%systemd_post %{name}.service %{name}.socket
+%systemd_post lldpad.service lldpad.socket
 
 %preun
-%systemd_preun %{name}.service %{name}.socket
+%systemd_preun lldpad.service lldpad.socket
 
 %postun
 /sbin/ldconfig
@@ -89,16 +90,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING README ChangeLog
-%{_sysconfdir}/bash_completion.d/*
+%doc ChangeLog README
 %attr(755,root,root) %{_sbindir}/dcbtool
 %attr(755,root,root) %{_sbindir}/lldpad
 %attr(755,root,root) %{_sbindir}/lldptool
+%attr(755,root,root) %{_sbindir}/vdptool
 %attr(755,root,root) %{_libdir}/liblldp_clif.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblldp_clif.so.1
-%{systemdunitdir}/%{name}.service
-%{systemdunitdir}/%{name}.socket
-%dir %{_sharedstatedir}/%{name}
+%{systemdunitdir}/lldpad.service
+%{systemdunitdir}/lldpad.socket
+%dir /var/lib/lldpad
+%{bash_compdir}/lldpad
+%{bash_compdir}/lldptool
 %{_mandir}/man8/dcbtool.8*
 %{_mandir}/man8/lldpad.8*
 %{_mandir}/man8/lldptool.8*
@@ -110,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/lldptool-med.8*
 %{_mandir}/man8/lldptool-pfc.8*
 %{_mandir}/man8/lldptool-vdp.8*
+%{_mandir}/man8/vdptool.8*
 
 %files devel
 %defattr(644,root,root,755)
@@ -117,3 +121,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/lldpad
 %{_pkgconfigdir}/liblldp_clif.pc
 %{_pkgconfigdir}/lldpad.pc
+%{_mandir}/man3/liblldp_clif-vdp22.3*
diff --git a/systemd-in-roor.patch b/systemd-in-roor.patch
index 31988d0..2cb4237 100644
--- a/systemd-in-roor.patch
+++ b/systemd-in-roor.patch
@@ -1,24 +1,11 @@
---- lldpad-1.0.1/Makefile.am~	2017-04-17 14:50:19.000000000 +0200
-+++ lldpad-1.0.1/Makefile.am	2017-04-17 15:00:14.349897556 +0200
-@@ -123,9 +123,9 @@
+--- openlldp-1.1.1/Makefile.am.orig	2024-03-05 19:46:14.000000000 +0100
++++ openlldp-1.1.1/Makefile.am	2025-08-12 06:26:23.844817423 +0200
+@@ -138,7 +138,7 @@ install-data-hook:	installdirs-local
+ pkgconfigdir = ${libdir}/pkgconfig
+ pkgconfig_DATA = lldpad.pc liblldp_clif.pc
  
- ## special hooks to handle the init script
- install-data-local: lldpad.service lldpad.socket
--	$(MKDIR_P) $(DESTDIR)/usr/lib/systemd/system
--	$(INSTALL_DATA) lldpad.service $(DESTDIR)/usr/lib/systemd/system/lldpad.service
--	$(INSTALL_DATA) lldpad.socket $(DESTDIR)/usr/lib/systemd/system/lldpad.socket
-+	$(MKDIR_P) $(DESTDIR)/lib/systemd/system
-+	$(INSTALL_DATA) lldpad.service $(DESTDIR)/lib/systemd/system/lldpad.service
-+	$(INSTALL_DATA) lldpad.socket $(DESTDIR)/lib/systemd/system/lldpad.socket
- 
- BASH_COMPLETION_DIR=/etc/bash_completion.d/
- 
-@@ -135,7 +135,7 @@
- 	$(INSTALL_DATA) ${srcdir}/contrib/bash_completion/* $(DESTDIR)/$(BASH_COMPLETION_DIR)
- 
- uninstall-local:
--	rm -f '$(DESTDIR)/usr/lib/systemd/system/lldpad.*'
-+	rm -f '$(DESTDIR)/lib/systemd/system/lldpad.*'
- 	rm -f '$(includedir)/dcbd/clif_cmds.h'
- 	rm -f '$(includedir)/dcbd'
+-systemdsystemunitdir = $(prefix)/lib/systemd/system
++systemdsystemunitdir = /lib/systemd/system
+ dist_systemdsystemunit_DATA = lldpad.service lldpad.socket
  
+ bashcompletiondir = $(sysconfdir)/bash_completion.d
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lldpad.git/commitdiff/a3edd67b89e71bb1a4b9d6c7e52ff21f05bb0bfb

