https://bugzilla.redhat.com/show_bug.cgi?id=1507103 --- Comment #75 from digimer <digimer@xxxxxxxxxx> --- There has been a lot of back and forth, but I think I got most of it. Please review and let me know if anything is still overlooked/outstanding. New .spec and srpm: https://www.alteeve.com/an-repo/files/packages/kronosnet.spec.1.1-4 https://www.alteeve.com/an-repo/files/packages/kronosnet-1.1-4.fc27.src.rpm f26: https://koji.fedoraproject.org/koji/taskinfo?taskID=25463902 f27: https://koji.fedoraproject.org/koji/taskinfo?taskID=25463917 f28: https://koji.fedoraproject.org/koji/taskinfo?taskID=25463942 rawhide: https://koji.fedoraproject.org/koji/taskinfo?taskID=25463975 epel7: https://koji.fedoraproject.org/koji/taskinfo?taskID=25463987 Diff from 1.1-3: ==== --- kronosnet.spec.1.1-3 2018-02-26 10:03:13.304992918 -0500 +++ kronosnet.spec.1.1-4 2018-03-04 02:00:23.290918796 -0500 @@ -70,8 +70,8 @@ Name: kronosnet Summary: Multipoint-to-Multipoint VPN daemon Version: 1.1 -Release: 3%{?dist} -License: GPLv2+ + LGPLv2+ +Release: 4%{?dist} +License: GPLv2+ and LGPLv2+ URL: http://www.kronosnet.org Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz @@ -190,6 +190,13 @@ # remove docs rm -rf %{buildroot}/usr/share/doc/kronosnet +# Disabled because of concern that the testsuite does not play nice with the +# network loopback interface. Upstream has a comprehensive CI/CD system which +# tests different versions of Fedora and should be very safe. In the unlikely +# event of bugs, we should probably avoid DoS´ing the fedora builders by +# generating unwanted traffic. +#%check + # main empty package %description kronosnet source @@ -205,14 +212,14 @@ %description -n kronosnetd The kronosnet daemon is a bridge between kronosnet switching engine - and kernel network tap devices, to create and administer a - distributed LAN over multipoint-to-multipoint VPNs. +and kernel network tap devices, to create and administer a +distributed LAN over multipoint-to-multipoint VPNs. - The daemon does a poor attempt to provide a configure UI similar - to other known network devices/tools (Cisco, quagga). - Beside looking horrific, it allows runtime changes and - reconfiguration of the kronosnet(s) without daemon reload - or service disruption. +The daemon does a poor attempt to provide a configure UI similar +to other known network devices/tools (Cisco, quagga). +Beside looking horrific, it allows runtime changes and +reconfiguration of the kronosnet(s) without daemon reload +or service disruption. %post -n kronosnetd %systemd_post kronosnetd.service @@ -242,15 +249,15 @@ License: LGPLv2+ %description -n libtap1 - This is an over-engineered commodity library to manage a pool - of tap devices and provides the basic - pre-up.d/up.d/down.d/post-down.d infrastructure. +This is an over-engineered commodity library to manage a pool +of tap devices and provides the basic +pre-up.d/up.d/down.d/post-down.d infrastructure. %files -n libtap1 %license COPYING.* COPYRIGHT %{_libdir}/libtap.so.* -%post -n libtap1 -p /sbin/ldconfig +%ldconfig_scriptlets libtap1 %postun -n libtap1 -p /sbin/ldconfig @@ -261,9 +268,9 @@ Requires: pkgconfig %description -n libtap1-devel - This is an over-engineered commodity library to manage a pool - of tap devices and provides the basic - pre-up.d/up.d/down.d/post-down.d infrastructure. +This is an over-engineered commodity library to manage a pool +of tap devices and provides the basic +pre-up.d/up.d/down.d/post-down.d infrastructure. %files -n libtap1-devel %license COPYING.* COPYRIGHT @@ -273,19 +280,19 @@ %endif %package -n libknet1 -Summary: Kronosnet core switching implementation +Summary: Kronosnet core switching implementation (protocol v1) License: LGPLv2+ BuildRequires: libqb-devel BuildRequires: doxygen %description -n libknet1 - Kronosnet, often referred to as knet, is a network abstraction layer - designed for High Availability use cases, where redundancy, security, - fault tolerance and fast fail-over are the core requirements of your - application. +Kronosnet, often referred to as knet, is a network abstraction layer +designed for High Availability use cases, where redundancy, security, +fault tolerance and fast fail-over are the core requirements of your +application. - The whole kronosnet core is implemented in this library. - Please refer to https://kronosnet.org/ for further information. +The whole kronosnet core is implemented in this library. +Please refer to https://kronosnet.org/ for further information. %files -n libknet1 %license COPYING.* COPYRIGHT @@ -303,12 +310,18 @@ Requires: pkgconfig %description -n libknet1-devel - The whole kronosnet core is implemented in this library. - Please refer to the not-yet-existing documentation for further - information. - +The whole kronosnet core is implemented in this library. +Please refer to the not-yet-existing documentation for further +information. + +# libknet.pc leading to pkgconfig(libknet) automatic virtual provides, +# like other files, is not explicitly versioned in the name like the +# subpackages are -- intention of doing so for subpackage names is +# to ease the cross-checking the compatibility of the remote clients +# interchanging data using this network communication library, as +# the number denotes the protocol version (providing multiple +# protocol versions in parallel is not planned). %files -n libknet1-devel -%license COPYING.* COPYRIGHT %{_libdir}/libknet.so %{_includedir}/libknet.h %{_libdir}/pkgconfig/libknet.pc @@ -321,7 +334,7 @@ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-crypto-nss-plugin - NSS crypto support for libknet1. +NSS crypto support for libknet1. %files -n libknet1-crypto-nss-plugin %{_libdir}/kronosnet/crypto_nss.so @@ -334,7 +347,7 @@ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-crypto-openssl-plugin - OpenSSL crypto support for libknet1. +OpenSSL crypto support for libknet1. %files -n libknet1-crypto-openssl-plugin %{_libdir}/kronosnet/crypto_openssl.so @@ -347,7 +360,7 @@ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-zlib-plugin - zlib compression support for libknet1. +zlib compression support for libknet1. %files -n libknet1-compress-zlib-plugin %{_libdir}/kronosnet/compress_zlib.so @@ -359,7 +372,7 @@ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lz4-plugin - lz4 and lz4hc compression support for libknet1. +lz4 and lz4hc compression support for libknet1. %files -n libknet1-compress-lz4-plugin %{_libdir}/kronosnet/compress_lz4.so @@ -373,7 +386,7 @@ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lzo2-plugin - lzo2 compression support for libknet1. +lzo2 compression support for libknet1. %files -n libknet1-compress-lzo2-plugin %{_libdir}/kronosnet/compress_lzo2.so @@ -386,7 +399,7 @@ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lzma-plugin - lzma compression support for libknet1. +lzma compression support for libknet1. %files -n libknet1-compress-lzma-plugin %{_libdir}/kronosnet/compress_lzma.so @@ -399,7 +412,7 @@ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-bzip2-plugin - bzip2 compression support for libknet1. +bzip2 compression support for libknet1. %files -n libknet1-compress-bzip2-plugin %{_libdir}/kronosnet/compress_bzip2.so @@ -416,7 +429,7 @@ %endif %description -n libknet1-crypto-plugins-all - meta package to install all of libknet1 crypto plugins +meta package to install all of libknet1 crypto plugins %files -n libknet1-crypto-plugins-all @@ -440,7 +453,7 @@ %endif %description -n libknet1-compress-plugins-all - meta package to install all of libknet1 compress plugins +meta package to install all of libknet1 compress plugins %files -n libknet1-compress-plugins-all @@ -451,7 +464,7 @@ Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release} %description -n libknet1-plugins-all - meta package to install all of libknet1 plugins +meta package to install all of libknet1 plugins %files -n libknet1-plugins-all @@ -460,6 +473,15 @@ %endif %changelog +* Sun Mar 04 2018 Madison Kelly <mkelly@xxxxxxxxxx> - 1.1-4 +- Removed leading spaces from descriptions. +- Added the (commented out) %%check tests. +- Updated the changelog macro references to have two percent signs. +- Dropped the redundant libknet1-devel license files. +- Changed 'GPLv2+ + LGPLv2+' to 'GPLv2+ and LGPLv2+'. +- Updated %%ldconfig_scriptlets call. +- Clarified the kronosnet protocol version in the summary. + * Mon Feb 26 2018 Madison Kelly <mkelly@xxxxxxxxxx> - 1.1-3 - Fixed the changelog to not have the full macro names. @@ -477,7 +499,7 @@ * Thu Feb 22 2018 Madison Kelly <mkelly@xxxxxxxxxx> - 1.0-9 - Changed the source tarball to be one from the upstream source. - Updated the main license. -- Moved down the {?systemd_requires} macro. +- Moved down the %%{?systemd_requires} macro. * Fri Feb 16 2018 Madison Kelly <mkelly@xxxxxxxxxx> - 1.0-8 - Reverted to 'BuildRequires: bzip2-devel' to fix EPEL7 builds. @@ -493,7 +515,7 @@ - Removed sysvinit checks. - Fixed the groupadd to add to system group. - Added build requirement for systemd. -- Added {_isa} macro to knet requirements in sub packages. +- Added %%{_isa} macro to knet requirements in sub packages. * Mon Feb 12 2018 Madison Kelly <mkelly@xxxxxxxxxx> - 1.0-5 - All changes related to this spec; ==== -- You are receiving this mail because: You are on the CC list for the bug. You are always notified about changes to this product and component _______________________________________________ package-review mailing list -- package-review@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to package-review-leave@xxxxxxxxxxxxxxxxxxxxxxx