https://bugzilla.redhat.com/show_bug.cgi?id=1507103
--- Comment #38 from digimer <digimer(a)alteeve.ca> ---
- Please remove %defattr(-,root,root,-) everywhere
Done.
- For kronosnetd:
* Requires(preun): shadow-utils <-- not needed
What about the (postrun) entry? I've left that for now.
* groupadd --force kronosnetadm <-- kronosnetadm should be
system account (and force is not needed), so result should be "groupadd -r
kronosnetadm"
OK, but I used the more verbose '--system' just to be a little more
self-documenting.
So the question is, if you want to keep compatibility with
non-systemd systems
No, I see no reason for this. Knet will never run on EL6. I do test against
EPEL7 and modern Fedoras, which are all systemd now. I'd actually prefer to
remove all sysvinit stuff down the road. I'm only not doing it now because I
still have too much to learn and I didn't want to slow down the initial
release.
Now that it is an issue though (if minor), I will try to remove it in this
release. I apologize if this introduces new issues at this stage.
- Missing "BuildRequires: systemd" (probably conditional)
so something like
Given the above comment, I added it without conditional.
Forgot one more thing. We need more %{_isa}. Just add them basically
for every...
Done.
New .spec and srpm:
https://www.alteeve.com/an-repo/files/packages/kronosnet.spec.1.0-6
https://www.alteeve.com/an-repo/files/packages/kronosnet-1.0-6.fc27.src.rpm
f26:
https://koji.fedoraproject.org/koji/taskinfo?taskID=25061282
f27:
https://koji.fedoraproject.org/koji/taskinfo?taskID=25061295
rawhide:
https://koji.fedoraproject.org/koji/taskinfo?taskID=25061303
epel7:
https://koji.fedoraproject.org/koji/taskinfo?taskID=25061269
Here is the diff in .spec from 1.0-5;
====
--- kronosnet.spec.1.0-5 2018-02-12 14:20:52.122179273 -0500
+++ kronosnet.spec.1.0-6 2018-02-15 00:25:25.797016016 -0500
@@ -70,7 +70,7 @@
Name: kronosnet
Summary: Multipoint-to-Multipoint VPN daemon
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+ and LGPLv2+
URL:
http://www.kronosnet.org
Source0:
http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz
@@ -78,6 +78,7 @@
# Build dependencies
BuildRequires: gcc
+BuildRequires: systemd
# required to build man pages
BuildRequires: libqb-devel libxml2-devel doxygen
%if %{defined buildsctp}
@@ -170,11 +171,7 @@
--enable-libtap \
%endif
--with-initdefaultdir=%{_sysconfdir}/sysconfig/ \
-%if %{defined _unitdir}
--with-systemddir=%{_unitdir}
-%else
- --with-initddir=%{_sysconfdir}/rc.d/init.d/
-%endif
make %{_smp_mflags}
@@ -188,13 +185,8 @@
find %{buildroot} -name "*.la" -exec rm {} \;
# handle systemd vs init script
-%if %{defined _unitdir}
# remove init scripts
rm -rf %{buildroot}/etc/init.d
-%else
-# remove systemd specific bits
-find %{buildroot} -name "*.service" -exec rm {} \;
-%endif
# remove docs
rm -rf %{buildroot}/usr/share/doc/kronosnet
@@ -209,7 +201,6 @@
Summary: Multipoint-to-Multipoint VPN daemon
License: GPLv2+ and LGPLv2+
Requires(post): shadow-utils
-Requires(preun): shadow-utils
Requires: pam, /etc/pam.d/passwd
%description -n kronosnetd
@@ -228,21 +219,14 @@
getent group kronosnetadm >/dev/null || groupadd --force kronosnetadm
%preun -n kronosnetd
-%if %{defined _unitdir}
- %if 0%{?systemd_preun:1}
+%if 0%{?systemd_preun:1}
%systemd_preun kronosnetd.service
- %else
+%else
if [ "$1" -eq 0 ]; then
/bin/systemctl --no-reload disable kronosnetd.service
/bin/systemctl stop kronosnetd.service >/dev/null 2>&1
fi
%endif
-%else
-if [ "$1" = 0 ]; then
- /sbin/service kronosnetd stop >/dev/null 2>&1
- /sbin/chkconfig --del kronosnetd
-fi
-%endif
%files -n kronosnetd
%license COPYING.* COPYRIGHT
@@ -251,11 +235,7 @@
%config(noreplace) %{_sysconfdir}/sysconfig/kronosnetd
%config(noreplace) %{_sysconfdir}/pam.d/kronosnetd
%config(noreplace) %{_sysconfdir}/logrotate.d/kronosnetd
-%if %{defined _unitdir}
%{_unitdir}/kronosnetd.service
-%else
-%config(noreplace) %{_sysconfdir}/rc.d/init.d/kronosnetd
-%endif
%{_sbindir}/*
%{_mandir}/man8/*
%endif
@@ -271,7 +251,6 @@
pre-up.d/up.d/down.d/post-down.d infrastructure.
%files -n libtap1
-%defattr(-,root,root,-)
%license COPYING.* COPYRIGHT
%{_libdir}/libtap.so.*
@@ -282,7 +261,7 @@
%package -n libtap1-devel
Summary: Simple userland wrapper around kernel tap devices (developer files)
License: GPLv2+ and LGPLv2+
-Requires: libtap1 = %{version}-%{release}
+Requires: libtap1%{_isa} = %{version}-%{release}
Requires: pkgconfig
%description -n libtap1-devel
@@ -291,7 +270,6 @@
pre-up.d/up.d/down.d/post-down.d infrastructure.
%files -n libtap1-devel
-%defattr(-,root,root,-)
%license COPYING.* COPYRIGHT
%{_libdir}/libtap.so
%{_includedir}/libtap.h
@@ -312,7 +290,6 @@
Please refer to
https://kronosnet.org/ for further information.
%files -n libknet1
-%defattr(-,root,root,-)
%license COPYING.* COPYRIGHT
%{_libdir}/libknet.so.*
%dir %{_libdir}/kronosnet
@@ -324,7 +301,7 @@
%package -n libknet1-devel
Summary: Kronosnet core switching implementation (developer files)
License: GPLv2+ and LGPLv2+
-Requires: libknet1 = %{version}-%{release}
+Requires: libknet1%{_isa} = %{version}-%{release}
Requires: pkgconfig
%description -n libknet1-devel
@@ -333,7 +310,6 @@
information.
%files -n libknet1-devel
-%defattr(-,root,root,-)
%license COPYING.* COPYRIGHT
%{_libdir}/libknet.so
%{_includedir}/libknet.h
@@ -344,13 +320,12 @@
%package -n libknet1-crypto-nss-plugin
Summary: Libknet1 nss support
License: GPLv2+ and LGPLv2+
-Requires: libknet1 = %{version}-%{release}
+Requires: libknet1%{_isa} = %{version}-%{release}
%description -n libknet1-crypto-nss-plugin
NSS crypto support for libknet1.
%files -n libknet1-crypto-nss-plugin
-%defattr(-,root,root,-)
%{_libdir}/kronosnet/crypto_nss.so
%endif
@@ -358,13 +333,12 @@
%package -n libknet1-crypto-openssl-plugin
Summary: Libknet1 openssl support
License: GPLv2+ and LGPLv2+
-Requires: libknet1 = %{version}-%{release}
+Requires: libknet1%{_isa} = %{version}-%{release}
%description -n libknet1-crypto-openssl-plugin
OpenSSL crypto support for libknet1.
%files -n libknet1-crypto-openssl-plugin
-%defattr(-,root,root,-)
%{_libdir}/kronosnet/crypto_openssl.so
%endif
@@ -372,26 +346,24 @@
%package -n libknet1-compress-zlib-plugin
Summary: Libknet1 zlib support
License: GPLv2+ and LGPLv2+
-Requires: libknet1 = %{version}-%{release}
+Requires: libknet1%{_isa} = %{version}-%{release}
%description -n libknet1-compress-zlib-plugin
zlib compression support for libknet1.
%files -n libknet1-compress-zlib-plugin
-%defattr(-,root,root,-)
%{_libdir}/kronosnet/compress_zlib.so
%endif
%if %{defined buildcompresslz4}
%package -n libknet1-compress-lz4-plugin
Summary: Libknet1 lz4 and lz4hc support
License: GPLv2+ and LGPLv2+
-Requires: libknet1 = %{version}-%{release}
+Requires: libknet1%{_isa} = %{version}-%{release}
%description -n libknet1-compress-lz4-plugin
lz4 and lz4hc compression support for libknet1.
%files -n libknet1-compress-lz4-plugin
-%defattr(-,root,root,-)
%{_libdir}/kronosnet/compress_lz4.so
%{_libdir}/kronosnet/compress_lz4hc.so
%endif
@@ -400,13 +372,12 @@
%package -n libknet1-compress-lzo2-plugin
Summary: Libknet1 lzo2 support
License: GPLv2+ and LGPLv2+
-Requires: libknet1 = %{version}-%{release}
+Requires: libknet1%{_isa} = %{version}-%{release}
%description -n libknet1-compress-lzo2-plugin
lzo2 compression support for libknet1.
%files -n libknet1-compress-lzo2-plugin
-%defattr(-,root,root,-)
%{_libdir}/kronosnet/compress_lzo2.so
%endif
@@ -414,13 +385,12 @@
%package -n libknet1-compress-lzma-plugin
Summary: Libknet1 lzma support
License: GPLv2+ and LGPLv2+
-Requires: libknet1 = %{version}-%{release}
+Requires: libknet1%{_isa} = %{version}-%{release}
%description -n libknet1-compress-lzma-plugin
lzma compression support for libknet1.
%files -n libknet1-compress-lzma-plugin
-%defattr(-,root,root,-)
%{_libdir}/kronosnet/compress_lzma.so
%endif
@@ -428,13 +398,12 @@
%package -n libknet1-compress-bzip2-plugin
Summary: Libknet1 bzip2 support
License: GPLv2+ and LGPLv2+
-Requires: libknet1 = %{version}-%{release}
+Requires: libknet1%{_isa} = %{version}-%{release}
%description -n libknet1-compress-bzip2-plugin
bzip2 compression support for libknet1.
%files -n libknet1-compress-bzip2-plugin
-%defattr(-,root,root,-)
%{_libdir}/kronosnet/compress_bzip2.so
%endif
====
--
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