From 61fb81073846939a5cf653ac06e647e9b1d4bc78d7d981fcd38c8c38c4a6ece4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 8 Mar 2021 08:27:20 +0000 Subject: [PATCH] Accepting request 877448 from home:darix:playground - Update to 2.2.2 https://www.keepalived.org/release-notes/Release-2.2.2.html - change how we install documentation to avoid duplicated files - Link all the files for ipset, iptables, libnl instead of dlopen. Drop the previous workaround for generating requires for the dlopen-ed libaries. - remove unsupported configure option: --enable-libiptc - Update to 2.2.1 OBS-URL: https://build.opensuse.org/request/show/877448 OBS-URL: https://build.opensuse.org/package/show/network/keepalived?expand=0&rev=68 --- keepalived-2.2.1.tar.gz | 3 --- keepalived-2.2.2.tar.gz | 3 +++ keepalived.changes | 13 ++++++++++++- keepalived.spec | 27 ++++++++++----------------- 4 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 keepalived-2.2.1.tar.gz create mode 100644 keepalived-2.2.2.tar.gz diff --git a/keepalived-2.2.1.tar.gz b/keepalived-2.2.1.tar.gz deleted file mode 100644 index 3e51b7e..0000000 --- a/keepalived-2.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91186f20c83ffc48d7a15a9a6e2329ed4feeb2dcb51f4aa9672c8840190ea741 -size 1150701 diff --git a/keepalived-2.2.2.tar.gz b/keepalived-2.2.2.tar.gz new file mode 100644 index 0000000..9d5052f --- /dev/null +++ b/keepalived-2.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:103692bd5345a4ed9f4581632ea636214fdf53e45682e200aab122c4fa674ece +size 1159896 diff --git a/keepalived.changes b/keepalived.changes index 5e04390..6d16b44 100644 --- a/keepalived.changes +++ b/keepalived.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Mar 7 00:34:36 UTC 2021 - Marcus Rueckert + +- Update to 2.2.2 + https://www.keepalived.org/release-notes/Release-2.2.2.html +- change how we install documentation to avoid duplicated files +- Link all the files for ipset, iptables, libnl instead of dlopen. + Drop the previous workaround for generating requires for the + dlopen-ed libaries. +- remove unsupported configure option: --enable-libiptc + ------------------------------------------------------------------- Thu Feb 18 16:17:02 UTC 2021 - Marcus Rueckert @@ -8,7 +19,7 @@ Thu Feb 18 16:17:02 UTC 2021 - Marcus Rueckert ------------------------------------------------------------------- Tue Jan 26 14:58:01 UTC 2021 - Marcus Rueckert -- Update to 2.2.1 +- Update to 2.2.1 https://www.keepalived.org/release-notes/Release-2.2.1.html https://www.keepalived.org/release-notes/Release-2.2.0.html https://www.keepalived.org/release-notes/Release-2.1.5.html diff --git a/keepalived.spec b/keepalived.spec index 618d014..cbd69a8 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -16,8 +16,6 @@ # -%define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") - #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates @@ -45,7 +43,7 @@ %bcond_without json Name: keepalived -Version: 2.2.1 +Version: 2.2.2 Release: 0 Summary: A keepalive facility for Linux License: GPL-2.0-or-later @@ -88,11 +86,6 @@ BuildRequires: pkgconfig(libsystemd) %else Requires(pre): %insserv_prereq %endif -%requires_file %{_libdir}/libipset.so -%requires_file %{_libdir}/libip6tc.so -%requires_file %{_libdir}/libip4tc.so -%requires_file %{_libdir}/libnl-3.so -%requires_file %{_libdir}/libnl-genl-3.so %description This project provides facilities for load balancing and high-availability to @@ -119,6 +112,7 @@ export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN" # --enable-dbus-create-instance \ %configure \ --disable-silent-rules \ + --docdir=%{_defaultdocdir}/%{name}/ \ --enable-bfd \ %if %{with json} --enable-json \ @@ -152,13 +146,12 @@ export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN" --enable-log-file \ --enable-routes \ --enable-iptables \ - --enable-dynamic-linking \ - --enable-libiptc \ - --enable-libiptc-dynamic \ + --disable-dynamic-linking \ + --disable-libiptc-dynamic \ + --disable-libipset-dynamic \ + --disable-libnl-dynamic \ --enable-libipset \ - --enable-libipset-dynamic \ --enable-libnl \ - --enable-libnl-dynamic \ --enable-stacktrace \ --enable-json make %{?_smp_mflags} @@ -177,6 +170,9 @@ ln -s /etc/init.d/keepalived %{buildroot}%{_sbindir}/rckeepalived chmod -R o= %{buildroot}/etc/keepalived rm -rv %{buildroot}/etc/keepalived/samples/ %{buildroot}/etc/sysconfig/keepalived +cp -rv \ + AUTHOR ChangeLog CONTRIBUTORS README doc/samples/ doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt \ + %{buildroot}%{_defaultdocdir}/%{name}/ %check # A build could silently have LVS support disabled if the kernel includes can't @@ -219,10 +215,7 @@ getent passwd %{name} >/dev/null || \ %files %defattr(-,root,root) %license COPYING -%doc AUTHOR ChangeLog CONTRIBUTORS README -%doc %{_datadir}/doc/keepalived/ -%doc doc/samples/ -%doc doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt +%doc %{_defaultdocdir}/%{name}/ %dir %{_sysconfdir}/keepalived %dir %attr(-,keepalived,keepalived) %{_var}/lib/%{name} %{_fillupdir}/sysconfig.%{name}