https://bugzilla.redhat.com/show_bug.cgi?id=1507103
--- Comment #35 from digimer <digi...@alteeve.ca> --- I think I have integrated the comments, save for the last one in comment #34 for "buildrequire". I'm not sure what you are referring to, specifically. If I can get clarification on that, or missed anything, please let me know and I'll roll a new RPM asap. New .spec and srpm: https://www.alteeve.com/an-repo/files/packages/kronosnet.spec.1.0-5 https://www.alteeve.com/an-repo/files/packages/kronosnet-1.0-5.fc27.src.rpm f26: https://koji.fedoraproject.org/koji/taskinfo?taskID=24971062 f27: https://koji.fedoraproject.org/koji/taskinfo?taskID=24971069 rawhide: https://koji.fedoraproject.org/koji/taskinfo?taskID=24971077 epel7: https://koji.fedoraproject.org/koji/taskinfo?taskID=24971089 Here is the diff in .spec from 1.0-4; ==== --- kronosnet.spec.1.0-4 2018-01-31 23:32:53.661198886 -0500 +++ kronosnet.spec.1.0-5 2018-02-12 14:20:52.122179273 -0500 @@ -70,10 +70,11 @@ Name: kronosnet Summary: Multipoint-to-Multipoint VPN daemon Version: 1.0 -Release: 3%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.kronosnet.org Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz +Patch0: gcc8-fixes.patch # Build dependencies BuildRequires: gcc @@ -83,16 +84,16 @@ BuildRequires: lksctp-tools-devel %endif %if %{defined buildcryptonss} -BuildRequires: /usr/include/nss3/nss.h /usr/include/nspr4/nspr.h +BuildRequires: nss-devel nspr-devel %endif %if %{defined buildcryptoopenssl} -BuildRequires: /usr/include/openssl/conf.h +BuildRequires: openssl-devel %endif %if %{defined buildcompresszlib} BuildRequires: zlib-devel %endif %if %{defined buildcompresslz4} -BuildRequires: /usr/include/lz4hc.h +BuildRequires: lz4-devel %endif %if %{defined buildcompresslzo2} BuildRequires: lzo-devel @@ -101,7 +102,7 @@ BuildRequires: xz-devel %endif %if %{defined buildcompressbzip2} -BuildRequires: /usr/include/bzlib.h +BuildRequires: bzip2-devel %endif %if %{defined buildkronosnetd} BuildRequires: pam-devel @@ -198,9 +199,6 @@ # remove docs rm -rf %{buildroot}/usr/share/doc/kronosnet -%clean -rm -rf %{buildroot} - # main empty package %description kronosnet source @@ -210,16 +208,6 @@ %package -n kronosnetd Summary: Multipoint-to-Multipoint VPN daemon License: GPLv2+ and LGPLv2+ -%if %{defined _unitdir} -## Needed for systemd unit - Removed, see: https://lists.fedoraproject.org/archives/list/de...@lists.fedoraproject.org/message/LLG4T53FW2BGVZLGLKNYTKPD5SQNBZ2Y/ -#Requires(post): systemd-sysv -#Requires(post): systemd-units -#Requires(preun): systemd-units -#Requires(postun): systemd-units -%else -Requires(post): chkconfig -Requires(preun): chkconfig, initscripts -%endif Requires(post): shadow-utils Requires(preun): shadow-utils Requires: pam, /etc/pam.d/passwd @@ -236,16 +224,8 @@ or service disruption. %post -n kronosnetd -%if %{defined _unitdir} - %if 0%{?systemd_post:1} - %systemd_post kronosnetd.service - %else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - %endif -%else -/sbin/chkconfig --add kronosnetd -%endif -/usr/sbin/groupadd --force --system kronosnetadm +%systemd_post kronosnetd.service +getent group kronosnetadm >/dev/null || groupadd --force kronosnetadm %preun -n kronosnetd %if %{defined _unitdir} @@ -265,7 +245,6 @@ %endif %files -n kronosnetd -%defattr(-,root,root,-) %license COPYING.* COPYRIGHT %dir %{_sysconfdir}/kronosnet %dir %{_sysconfdir}/kronosnet/* @@ -363,7 +342,7 @@ %if %{defined buildcryptonss} %package -n libknet1-crypto-nss-plugin -Summary: libknet1 nss support +Summary: Libknet1 nss support License: GPLv2+ and LGPLv2+ Requires: libknet1 = %{version}-%{release} @@ -377,7 +356,7 @@ %if %{defined buildcryptoopenssl} %package -n libknet1-crypto-openssl-plugin -Summary: libknet1 openssl support +Summary: Libknet1 openssl support License: GPLv2+ and LGPLv2+ Requires: libknet1 = %{version}-%{release} @@ -391,7 +370,7 @@ %if %{defined buildcompresszlib} %package -n libknet1-compress-zlib-plugin -Summary: libknet1 zlib support +Summary: Libknet1 zlib support License: GPLv2+ and LGPLv2+ Requires: libknet1 = %{version}-%{release} @@ -404,7 +383,7 @@ %endif %if %{defined buildcompresslz4} %package -n libknet1-compress-lz4-plugin -Summary: libknet1 lz4 and lz4hc support +Summary: Libknet1 lz4 and lz4hc support License: GPLv2+ and LGPLv2+ Requires: libknet1 = %{version}-%{release} @@ -419,7 +398,7 @@ %if %{defined buildcompresslzo2} %package -n libknet1-compress-lzo2-plugin -Summary: libknet1 lzo2 support +Summary: Libknet1 lzo2 support License: GPLv2+ and LGPLv2+ Requires: libknet1 = %{version}-%{release} @@ -433,7 +412,7 @@ %if %{defined buildcompresslzma} %package -n libknet1-compress-lzma-plugin -Summary: libknet1 lzma support +Summary: Libknet1 lzma support License: GPLv2+ and LGPLv2+ Requires: libknet1 = %{version}-%{release} @@ -447,7 +426,7 @@ %if %{defined buildcompressbzip2} %package -n libknet1-compress-bzip2-plugin -Summary: libknet1 bzip2 support +Summary: Libknet1 bzip2 support License: GPLv2+ and LGPLv2+ Requires: libknet1 = %{version}-%{release} @@ -460,13 +439,13 @@ %endif %package -n libknet1-crypto-plugins-all -Summary: libknet1 crypto plugins meta package +Summary: Libknet1 crypto plugins meta package License: GPLv2+ and LGPLv2+ %if %{defined buildcryptonss} -Requires: libknet1-crypto-nss-plugin +Requires: libknet1-crypto-nss-plugin%{_isa} = %{version}-%{release} %endif %if %{defined buildcryptoopenssl} -Requires: libknet1-crypto-openssl-plugin +Requires: libknet1-crypto-openssl-plugin%{_isa} = %{version}-%{release} %endif %description -n libknet1-crypto-plugins-all @@ -475,22 +454,22 @@ %files -n libknet1-crypto-plugins-all %package -n libknet1-compress-plugins-all -Summary: libknet1 compress plugins meta package +Summary: Libknet1 compress plugins meta package License: GPLv2+ and LGPLv2+ %if %{defined buildcompresszlib} -Requires: libknet1-compress-zlib-plugin +Requires: libknet1-compress-zlib-plugin%{_isa} = %{version}-%{release} %endif %if %{defined buildcompresslz4} -Requires: libknet1-compress-lz4-plugin +Requires: libknet1-compress-lz4-plugin%{_isa} = %{version}-%{release} %endif %if %{defined buildcompresslzo2} -Requires: libknet1-compress-lzo2-plugin +Requires: libknet1-compress-lzo2-plugin%{_isa} = %{version}-%{release} %endif %if %{defined buildcompresslzma} -Requires: libknet1-compress-lzma-plugin +Requires: libknet1-compress-lzma-plugin%{_isa} = %{version}-%{release} %endif %if %{defined buildcompressbzip2} -Requires: libknet1-compress-bzip2-plugin +Requires: libknet1-compress-bzip2-plugin%{_isa} = %{version}-%{release} %endif %description -n libknet1-compress-plugins-all @@ -499,10 +478,10 @@ %files -n libknet1-compress-plugins-all %package -n libknet1-plugins-all -Summary: libknet1 plugins meta package +Summary: Libknet1 plugins meta package License: GPLv2+ and LGPLv2+ -Requires: libknet1-compress-plugins-all -Requires: libknet1-crypto-plugins-all +Requires: libknet1-compress-plugins-all%{_isa} = %{version}-%{release} +Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release} %description -n libknet1-plugins-all meta package to install all of libknet1 plugins @@ -514,7 +493,15 @@ %endif %changelog -* Tue Jan 31 2018 Madison Kelly <mke...@alteeve.ca> - 1.0-4 +* Mon Feb 12 2018 Madison Kelly <mke...@alteeve.ca> - 1.0-5 +- All changes related to this spec; +- Fixed typo in previous changelog date (Tue -> Wed). +- Capitalized summaries as needed. +- Changed Requires that were file paths to package names. +- Added arch and version/release requirements for knet packages. +- Changed groupadd to be a little smarter. + +* Wed Jan 31 2018 Madison Kelly <mke...@alteeve.ca> - 1.0-4 - Added patch for gcc8 fix. - Cleaned up description. ==== -- 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@lists.fedoraproject.org To unsubscribe send an email to package-review-le...@lists.fedoraproject.org
