https://bugzilla.redhat.com/show_bug.cgi?id=1507103 --- Comment #40 from digimer <digimer@xxxxxxxxxx> --- > You've forgot to update changelog Doh! Added (for 1.0-6 and -7) > As was noted in previous comment, please add postun Added, but please verify I added in the correct location. > Please fix the "%preun -n kronosnetd" section... Being an if/else, with 'if [ "$1" -eq 0 ]; ...' being in the 'else', I removed that as well. Was that correct? > Add %{?systemd_requires} as described in ... Done. > License - ... Done. > Idea of using pkgconfig(foo) seems to be quite nice, could you please give it a try? Done. Question though; I wasn't able to find a clear explanation about what this change does (see: https://fedoraproject.org/wiki/Packaging:Guidelines#Pkgconfig_Files_.28foo.pc.29). Why would we not also wrap, say, libxml2-devel, lksctp-tools-devel, etc in a similar manner? NOTE: It would seem that one of these changes breaks epel7 build. I will dig into this and post a new .spec if I can sort it out. For now, this one is up for you to review as it currently stands. New .spec and srpm: https://www.alteeve.com/an-repo/files/packages/kronosnet.spec.1.0-7 https://www.alteeve.com/an-repo/files/packages/kronosnet-1.0-7.fc27.src.rpm f26: https://koji.fedoraproject.org/koji/taskinfo?taskID=25080933 f27: https://koji.fedoraproject.org/koji/taskinfo?taskID=25080940 rawhide: https://koji.fedoraproject.org/koji/taskinfo?taskID=25080948 epel7: *Failed* https://koji.fedoraproject.org/koji/taskinfo?taskID=25080956 Here is the diff in .spec from 1.0-5; ==== --- kronosnet.spec.1.0-6 2018-02-15 00:25:25.797016016 -0500 +++ kronosnet.spec.1.0-7 2018-02-15 19:18:05.854232031 -0500 @@ -70,40 +70,42 @@ Name: kronosnet Summary: Multipoint-to-Multipoint VPN daemon Version: 1.0 -Release: 6%{?dist} -License: GPLv2+ and LGPLv2+ +Release: 7%{?dist} +License: GPLv2+ URL: http://www.kronosnet.org Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz Patch0: gcc8-fixes.patch # Build dependencies BuildRequires: gcc +%{?systemd_requires} BuildRequires: systemd # required to build man pages -BuildRequires: libqb-devel libxml2-devel doxygen +BuildRequires: libxml2-devel doxygen +BuildRequires: pkgconfig(libqb) %if %{defined buildsctp} BuildRequires: lksctp-tools-devel %endif %if %{defined buildcryptonss} -BuildRequires: nss-devel nspr-devel +BuildRequires: pkgconfig(nss) %endif %if %{defined buildcryptoopenssl} -BuildRequires: openssl-devel +BuildRequires: pkgconfig(openssl) %endif %if %{defined buildcompresszlib} -BuildRequires: zlib-devel +BuildRequires: pkgconfig(zlib) %endif %if %{defined buildcompresslz4} -BuildRequires: lz4-devel +BuildRequires: pkgconfig(liblz4) %endif %if %{defined buildcompresslzo2} BuildRequires: lzo-devel %endif %if %{defined buildcompresslzma} -BuildRequires: xz-devel +BuildRequires: pkgconfig(liblzma) %endif %if %{defined buildcompressbzip2} -BuildRequires: bzip2-devel +BuildRequires: pkgconfig(bzip2) %endif %if %{defined buildkronosnetd} BuildRequires: pam-devel @@ -199,7 +201,7 @@ ## Runtime and subpackages section %package -n kronosnetd Summary: Multipoint-to-Multipoint VPN daemon -License: GPLv2+ and LGPLv2+ +License: GPLv2+ Requires(post): shadow-utils Requires: pam, /etc/pam.d/passwd @@ -218,15 +220,11 @@ %systemd_post kronosnetd.service getent group kronosnetadm >/dev/null || groupadd --force kronosnetadm +%postun -n kronosnetd +%systemd_postun kronosnetd.service + %preun -n kronosnetd -%if 0%{?systemd_preun:1} - %systemd_preun kronosnetd.service -%else -if [ "$1" -eq 0 ]; then - /bin/systemctl --no-reload disable kronosnetd.service - /bin/systemctl stop kronosnetd.service >/dev/null 2>&1 -fi -%endif +%systemd_preun kronosnetd.service %files -n kronosnetd %license COPYING.* COPYRIGHT @@ -243,7 +241,7 @@ %if %{defined buildlibtap} %package -n libtap1 Summary: Simple userland wrapper around kernel tap devices -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ %description -n libtap1 This is an over-engineered commodity library to manage a pool @@ -260,7 +258,7 @@ %package -n libtap1-devel Summary: Simple userland wrapper around kernel tap devices (developer files) -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libtap1%{_isa} = %{version}-%{release} Requires: pkgconfig @@ -278,7 +276,7 @@ %package -n libknet1 Summary: Kronosnet core switching implementation -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ %description -n libknet1 Kronosnet, often referred to as knet, is a network abstraction layer @@ -300,7 +298,7 @@ %package -n libknet1-devel Summary: Kronosnet core switching implementation (developer files) -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} Requires: pkgconfig @@ -319,7 +317,7 @@ %if %{defined buildcryptonss} %package -n libknet1-crypto-nss-plugin Summary: Libknet1 nss support -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-crypto-nss-plugin @@ -332,7 +330,7 @@ %if %{defined buildcryptoopenssl} %package -n libknet1-crypto-openssl-plugin Summary: Libknet1 openssl support -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-crypto-openssl-plugin @@ -345,7 +343,7 @@ %if %{defined buildcompresszlib} %package -n libknet1-compress-zlib-plugin Summary: Libknet1 zlib support -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-zlib-plugin @@ -357,7 +355,7 @@ %if %{defined buildcompresslz4} %package -n libknet1-compress-lz4-plugin Summary: Libknet1 lz4 and lz4hc support -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lz4-plugin @@ -371,7 +369,7 @@ %if %{defined buildcompresslzo2} %package -n libknet1-compress-lzo2-plugin Summary: Libknet1 lzo2 support -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lzo2-plugin @@ -384,7 +382,7 @@ %if %{defined buildcompresslzma} %package -n libknet1-compress-lzma-plugin Summary: Libknet1 lzma support -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lzma-plugin @@ -397,7 +395,7 @@ %if %{defined buildcompressbzip2} %package -n libknet1-compress-bzip2-plugin Summary: Libknet1 bzip2 support -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-bzip2-plugin @@ -409,7 +407,7 @@ %package -n libknet1-crypto-plugins-all Summary: Libknet1 crypto plugins meta package -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ %if %{defined buildcryptonss} Requires: libknet1-crypto-nss-plugin%{_isa} = %{version}-%{release} %endif @@ -424,7 +422,7 @@ %package -n libknet1-compress-plugins-all Summary: Libknet1 compress plugins meta package -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ %if %{defined buildcompresszlib} Requires: libknet1-compress-zlib-plugin%{_isa} = %{version}-%{release} %endif @@ -448,7 +446,7 @@ %package -n libknet1-plugins-all Summary: Libknet1 plugins meta package -License: GPLv2+ and LGPLv2+ +License: LGPLv2+ Requires: libknet1-compress-plugins-all%{_isa} = %{version}-%{release} Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release} @@ -462,6 +460,19 @@ %endif %changelog +* Thu Feb 15 2018 Madison Kelly <mkelly@xxxxxxxxxx> - 1.0-7 +- Added missing 1.0-6 changelog. +- Added kronosnetd postun. +- Clarified licensing. +- (re)added systemd_requires. +- Wrapped several buildrequires with pkgconfig(). + +* Wed Feb 14 2018 Madison Kelly <mkelly@xxxxxxxxxx> - 1.0-6 +- Removed sysvinit checks. +- Fixed the groupadd to add to system group. +- Added build requirement for systemd. +- Added %{_isa} to knet requirements in sub packages. + * Mon Feb 12 2018 Madison Kelly <mkelly@xxxxxxxxxx> - 1.0-5 - All changes related to this spec; - Fixed typo in previous changelog date (Tue -> Wed). ==== -- 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
