diff --git a/lldpd-fedora.sysconfig b/lldpd-fedora.sysconfig new file mode 100644 index 0000000..de2adcc --- /dev/null +++ b/lldpd-fedora.sysconfig @@ -0,0 +1,8 @@ +## Path: Network/Discovery +## Description: lldpd configuration +## Type: string(-x,-c,-s,-e,-f) +## Default: "" +## ServiceRestart: lldpd +# Parameters for lldpd. See the manual page for the +# accepted parameters. +LLDPD_OPTIONS="" diff --git a/lldpd.spec b/lldpd.spec index d908169..ad5185a 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -7,28 +7,16 @@ Name: lldpd Version: 0.9.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC URL: https://%{gh_owner}.github.io/%{name}/ -Source0: https://github.com/%{gh_owner}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://media.luffy.cx/files/lldpd/lldpd-%{version}.tar.gz Source1: %{name}-fedora.service Source2: %{name}-tmpfiles +Source3: %{name}-fedora.sysconfig -%if 0%{?with_tests} -#For tests -BuildRequires: python3-apipkg -BuildRequires: python3-execnet -BuildRequires: python3-py -BuildRequires: python3-pyroute2 -BuildRequires: python3-pytest -BuildRequires: python3-pytest-xdist -BuildRequires: python3-wheel -BuildRequires: python3-devel -%endif - -BuildRequires: libtool BuildRequires: libevent-devel BuildRequires: readline-devel BuildRequires: check-devel @@ -59,7 +47,6 @@ Summary: %{summary} %build -./autogen.sh %configure --disable-static --with-snmp --disable-silent-rules \ --with-systemdsystemunitdir=%{_unitdir} --with-sysusersdir=no \ --with-privsep-user=%{name} --with-privsep-group=%{name} \ @@ -72,9 +59,9 @@ make %{?_smp_mflags} %install %make_install -install -p -D -m644 redhat/%{name}.sysconfig %{buildroot}/etc/sysconfig/%{name} install -p -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service install -p -D -m644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf +install -p -D -m644 %{SOURCE3} %{buildroot}/etc/sysconfig/%{name} install -d -D -m 0755 %{buildroot}/run/%{name}/chroot install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name} # remove the docs from buildroot @@ -88,12 +75,6 @@ rm -f %{buildroot}/usr/share/zsh/vendor-completions/_lldpcli # remove static libtool archive rm -f %{buildroot}%{_libdir}/liblldpctl.la -%check -%if 0%{?with_tests} -cd tests/integration -%{__python3} -m pytest -n 5 -vv --boxed -%endif - %pre getent group %{name} >/dev/null || groupadd -r %{name} getent passwd %{name} >/dev/null || \ @@ -139,6 +120,9 @@ exit 0 %changelog +* Wed Apr 05 2017 James Hogarth - 0.9.7-3 +- Use the official release tarball rather than the github snapshot + * Wed Apr 05 2017 James Hogarth - 0.9.7-2 - Tweaks to spec requested in review