0.9.45 bump

This commit is contained in:
Petr Šabata 2012-08-15 14:03:03 +02:00
parent 42ff57efa1
commit 22fc8f5861
5 changed files with 32 additions and 19 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/lldpad-0.9.44.tar.gz
/lldpad-0.9.45.tar.gz

View File

@ -1,12 +0,0 @@
--- lldpad-0.9.41/Makefile.am 2011-01-11 03:35:01.000000000 +0100
+++ lldpad-0.9.41/Makefile.am.new 2011-02-04 10:11:55.904482987 +0100
@@ -86,9 +86,6 @@
install-data-hook:
/sbin/chkconfig --add lldpad || true
- ## provide legacy support for apps that use the old dcbd interface.
- test -e $(includedir)/dcbd || `ln -T -s $(includedir)/lldpad $(includedir)/dcbd`
- test -e $(includedir)/dcbd/clif_cmds.h || `ln -T -s $(includedir)/lldpad/lldp_dcbx_cmds.h $(includedir)/dcbd/clif_cmds.h`
uninstall-local:
/sbin/chkconfig --del lldpad || true

View File

@ -0,0 +1,14 @@
diff --git a/configure.ac b/configure.ac
index 59cd8f6..f147e92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,9 @@
AC_INIT([lldpad], [0.9.45], [lldp-devel@open-lldp.org])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
+
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],[compile debug programs]),
[enable_debug=yes], [enable_debug=no])

View File

@ -2,14 +2,14 @@
%define _hardened_build 1
Name: lldpad
Version: 0.9.44
Release: 2%{?dist}
Version: 0.9.45
Release: 1%{?dist}
Summary: Intel LLDP Agent
Group: System Environment/Daemons
License: GPLv2
URL: http://open-lldp.org/
Source0: %{name}-%{version}.tar.gz
Patch0: lldpad-0.9.41-make.patch
Patch0: lldpad-0.9.45-archiver.patch
Patch1: lldpad-0.9.41-lldptool-invalid-pointer.patch
Requires: kernel >= 2.6.32
BuildRequires: systemd-units
@ -42,13 +42,12 @@ that use %{name}.
%prep
%setup -q
# Fedora patches
%patch0 -p1 -b .make
%patch0 -p1 -b .archiver
%patch1 -p1 -b .invalid-pointer
%build
./bootstrap.sh
%configure
%configure --disable-static
make %{?_smp_mflags}
%install
@ -58,8 +57,10 @@ mkdir -p %{buildroot}%{_unitdir}
install -m644 %{name}.service %{buildroot}%{_unitdir}
rm -rf %{buildroot}/etc/init.d
mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
rm -f %{buildroot}%{_libdir}/liblldp_clif.la
%post
/sbin/ldconfig
if [ $1 -eq 1 ]; then
systemctl daemon-reload >/dev/null 2>&1 || :
fi
@ -71,6 +72,7 @@ if [ $1 -eq 0 ]; then
fi
%postun
/sbin/ldconfig
if [ $1 -eq 1 ]; then
systemctl try-restart %{name}.service >/dev/null 2>&1 || :
fi
@ -95,15 +97,23 @@ fi
%files
%doc COPYING README ChangeLog
%{_sbindir}/*
%{_libdir}/liblldp_clif.so.*
%dir %{_sharedstatedir}/%{name}
%{_unitdir}/%{name}.service
%dir %{_sysconfdir}/bash_completion.d/
%{_sysconfdir}/bash_completion.d/*
%{_mandir}/man8/*
%files devel
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/liblldp_clif.so
%changelog
* Wed Aug 15 2012 Petr Šabata <contyk@redhat.com> - 0.9.45-1
- 0.9.45 bump
- Provide bash-completion and the new clif library
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.44-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

View File

@ -1 +1 @@
d5396e069efd5ccf2073ce385df56cfe lldpad-0.9.44.tar.gz
b06621c730a5e6f575755b061676ac5e lldpad-0.9.45.tar.gz