new upstream release and spec file cleanup
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
This commit is contained in:
Fabio M. Di Nitto
parent
4078cbd824
commit
72543ba119
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/kronosnet-1.9.tar.xz
|
||||
/kronosnet-1.10.tar.xz
|
||||
|
||||
256
kronosnet.spec
256
kronosnet.spec
@ -19,6 +19,7 @@
|
||||
%bcond_without lzo2
|
||||
%bcond_without lzma
|
||||
%bcond_without bzip2
|
||||
%bcond_without zstd
|
||||
%bcond_with kronosnetd
|
||||
%bcond_without libnozzle
|
||||
%bcond_with runautogen
|
||||
@ -31,99 +32,58 @@
|
||||
%undefine _enable_debug_packages
|
||||
%endif
|
||||
|
||||
%if %{with sctp}
|
||||
%global buildsctp 1
|
||||
%endif
|
||||
%if %{with nss}
|
||||
%global buildcryptonss 1
|
||||
%endif
|
||||
%if %{with openssl}
|
||||
%global buildcryptoopenssl 1
|
||||
%endif
|
||||
%if %{with zlib}
|
||||
%global buildcompresszlib 1
|
||||
%endif
|
||||
%if %{with lz4}
|
||||
%global buildcompresslz4 1
|
||||
%endif
|
||||
%if %{with lzo2}
|
||||
%global buildcompresslzo2 1
|
||||
%endif
|
||||
%if %{with lzma}
|
||||
%global buildcompresslzma 1
|
||||
%endif
|
||||
%if %{with bzip2}
|
||||
%global buildcompressbzip2 1
|
||||
%endif
|
||||
%if %{with libnozzle}
|
||||
%global buildlibnozzle 1
|
||||
%endif
|
||||
%if %{with kronosnetd}
|
||||
%global buildlibnozzle 1
|
||||
%global buildkronosnetd 1
|
||||
%endif
|
||||
%if %{with runautogen}
|
||||
%global buildautogen 1
|
||||
%endif
|
||||
%if %{with buildman}
|
||||
%global buildmanpages 1
|
||||
%endif
|
||||
%if %{with installtests}
|
||||
%global installtestsuite 1
|
||||
%endif
|
||||
|
||||
# main (empty) package
|
||||
# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
|
||||
|
||||
Name: kronosnet
|
||||
Summary: Multipoint-to-Multipoint VPN daemon
|
||||
Version: 1.9
|
||||
Version: 1.10
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: http://www.kronosnet.org
|
||||
Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.xz
|
||||
|
||||
URL: https://kronosnet.org
|
||||
Source0: https://kronosnet.org/releases/%{name}-%{version}.tar.xz
|
||||
|
||||
# Build dependencies
|
||||
BuildRequires: gcc
|
||||
# required to build man pages
|
||||
%if %{defined buildmanpages}
|
||||
%if %{with buildman}
|
||||
BuildRequires: libqb-devel libxml2-devel doxygen
|
||||
%endif
|
||||
%if %{defined buildsctp}
|
||||
%if %{with sctp}
|
||||
BuildRequires: lksctp-tools-devel
|
||||
%endif
|
||||
%if %{defined buildcryptonss}
|
||||
BuildRequires: nss-devel
|
||||
%if %{with nss}
|
||||
BuildRequires: nss-devel
|
||||
%endif
|
||||
%if %{defined buildcryptoopenssl}
|
||||
%if %{with openssl}
|
||||
BuildRequires: openssl-devel
|
||||
%endif
|
||||
%if %{defined buildcompresszlib}
|
||||
%if %{with zlib}
|
||||
BuildRequires: zlib-devel
|
||||
%endif
|
||||
%if %{defined buildcompresslz4}
|
||||
%if %{with lz4}
|
||||
BuildRequires: lz4-devel
|
||||
%endif
|
||||
%if %{defined buildcompresslzo2}
|
||||
%if %{with lzo2}
|
||||
BuildRequires: lzo-devel
|
||||
%endif
|
||||
%if %{defined buildcompresslzma}
|
||||
%if %{with lzma}
|
||||
BuildRequires: xz-devel
|
||||
%endif
|
||||
%if %{defined buildcompressbzip2}
|
||||
%if %{with bzip2}
|
||||
BuildRequires: bzip2-devel
|
||||
%endif
|
||||
%if %{defined buildkronosnetd}
|
||||
%if %{with zstd}
|
||||
BuildRequires: libzstd-devel
|
||||
%endif
|
||||
%if %{with kronosnetd}
|
||||
BuildRequires: pam-devel
|
||||
%endif
|
||||
%if %{defined buildlibnozzle}
|
||||
%if %{with libnozzle}
|
||||
BuildRequires: libnl3-devel
|
||||
%endif
|
||||
%if %{defined buildautogen}
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
%if %{with runautogen}
|
||||
BuildRequires: autoconf automake libtool
|
||||
%endif
|
||||
|
||||
%prep
|
||||
@ -131,72 +91,77 @@ BuildRequires: libtool
|
||||
|
||||
%build
|
||||
%if %{with runautogen}
|
||||
./autogen.sh
|
||||
./autogen.sh
|
||||
%endif
|
||||
|
||||
%{configure} \
|
||||
%if %{defined installtestsuite}
|
||||
--enable-install-tests \
|
||||
%if %{with installtests}
|
||||
--enable-install-tests \
|
||||
%else
|
||||
--disable-install-tests \
|
||||
--disable-install-tests \
|
||||
%endif
|
||||
%if %{defined buildmanpages}
|
||||
--enable-man \
|
||||
%if %{with buildman}
|
||||
--enable-man \
|
||||
%else
|
||||
--disable-man \
|
||||
--disable-man \
|
||||
%endif
|
||||
%if %{defined buildsctp}
|
||||
--enable-libknet-sctp \
|
||||
%if %{with sctp}
|
||||
--enable-libknet-sctp \
|
||||
%else
|
||||
--disable-libknet-sctp \
|
||||
--disable-libknet-sctp \
|
||||
%endif
|
||||
%if %{defined buildcryptonss}
|
||||
--enable-crypto-nss \
|
||||
%if %{with nss}
|
||||
--enable-crypto-nss \
|
||||
%else
|
||||
--disable-crypto-nss \
|
||||
--disable-crypto-nss \
|
||||
%endif
|
||||
%if %{defined buildcryptoopenssl}
|
||||
--enable-crypto-openssl \
|
||||
%if %{with openssl}
|
||||
--enable-crypto-openssl \
|
||||
%else
|
||||
--disable-crypto-openssl \
|
||||
--disable-crypto-openssl \
|
||||
%endif
|
||||
%if %{defined buildcompresszlib}
|
||||
--enable-compress-zlib \
|
||||
%if %{with zlib}
|
||||
--enable-compress-zlib \
|
||||
%else
|
||||
--disable-compress-zlib \
|
||||
--disable-compress-zlib \
|
||||
%endif
|
||||
%if %{defined buildcompresslz4}
|
||||
--enable-compress-lz4 \
|
||||
%if %{with lz4}
|
||||
--enable-compress-lz4 \
|
||||
%else
|
||||
--disable-compress-lz4 \
|
||||
--disable-compress-lz4 \
|
||||
%endif
|
||||
%if %{defined buildcompresslzo2}
|
||||
--enable-compress-lzo2 \
|
||||
%if %{with lzo2}
|
||||
--enable-compress-lzo2 \
|
||||
%else
|
||||
--disable-compress-lzo2 \
|
||||
--disable-compress-lzo2 \
|
||||
%endif
|
||||
%if %{defined buildcompresslzma}
|
||||
--enable-compress-lzma \
|
||||
%if %{with lzma}
|
||||
--enable-compress-lzma \
|
||||
%else
|
||||
--disable-compress-lzma \
|
||||
--disable-compress-lzma \
|
||||
%endif
|
||||
%if %{defined buildcompressbzip2}
|
||||
--enable-compress-bzip2 \
|
||||
%if %{with bzip2}
|
||||
--enable-compress-bzip2 \
|
||||
%else
|
||||
--disable-compress-bzip2 \
|
||||
--disable-compress-bzip2 \
|
||||
%endif
|
||||
%if %{defined buildkronosnetd}
|
||||
--enable-kronosnetd \
|
||||
%endif
|
||||
%if %{defined buildlibnozzle}
|
||||
--enable-libnozzle \
|
||||
%endif
|
||||
--with-initdefaultdir=%{_sysconfdir}/sysconfig/ \
|
||||
%if %{defined _unitdir}
|
||||
--with-systemddir=%{_unitdir}
|
||||
%if %{with zstd}
|
||||
--enable-compress-zstd \
|
||||
%else
|
||||
--with-initddir=%{_sysconfdir}/rc.d/init.d/
|
||||
--disable-compress-zstd \
|
||||
%endif
|
||||
%if %{with kronosnetd}
|
||||
--enable-kronosnetd \
|
||||
%else
|
||||
--disable-kronosnetd \
|
||||
%endif
|
||||
%if %{with libnozzle}
|
||||
--enable-libnozzle \
|
||||
%else
|
||||
--disable-libnozzle \
|
||||
%endif
|
||||
--with-initdefaultdir=%{_sysconfdir}/sysconfig/ \
|
||||
--with-systemddir=%{_unitdir}
|
||||
|
||||
make %{_smp_mflags}
|
||||
|
||||
@ -210,14 +175,8 @@ find %{buildroot} -name "*.a" -exec rm {} \;
|
||||
# remove libtools leftovers
|
||||
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
|
||||
@ -226,11 +185,11 @@ rm -rf %{buildroot}/usr/share/doc/kronosnet
|
||||
%description
|
||||
The kronosnet source
|
||||
|
||||
%if %{defined buildkronosnetd}
|
||||
%if %{with kronosnetd}
|
||||
## Runtime and subpackages section
|
||||
%package -n kronosnetd
|
||||
Summary: Multipoint-to-Multipoint VPN daemon
|
||||
# Needed for systemd unit
|
||||
License: GPLv2+
|
||||
Requires(post): systemd-sysv
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
@ -251,7 +210,7 @@ Requires: pam, /etc/pam.d/passwd
|
||||
|
||||
%post -n kronosnetd
|
||||
%systemd_post kronosnetd.service
|
||||
getent group kronosnetadm >/dev/null || groupadd --force kronosnetadm
|
||||
getent group kronosnetadm >/dev/null || groupadd --force --system kronosnetadm
|
||||
|
||||
%preun -n kronosnetd
|
||||
%systemd_preun kronosnetd.service
|
||||
@ -268,7 +227,7 @@ getent group kronosnetadm >/dev/null || groupadd --force kronosnetadm
|
||||
%{_mandir}/man8/*
|
||||
%endif
|
||||
|
||||
%if %{defined buildlibnozzle}
|
||||
%if %{with libnozzle}
|
||||
%package -n libnozzle1
|
||||
Summary: Simple userland wrapper around kernel tap devices
|
||||
License: LGPLv2+
|
||||
@ -282,12 +241,17 @@ License: LGPLv2+
|
||||
%license COPYING.* COPYRIGHT
|
||||
%{_libdir}/libnozzle.so.*
|
||||
|
||||
%if 0%{?ldconfig_scriptlets}
|
||||
%ldconfig_scriptlets -n libnozzle1
|
||||
%else
|
||||
%post -n libnozzle1 -p /sbin/ldconfig
|
||||
%postun -n libnozzle1 -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%package -n libnozzle1-devel
|
||||
Summary: Simple userland wrapper around kernel tap devices (developer files)
|
||||
License: LGPLv2+
|
||||
Requires: libnozzle1 = %{version}-%{release}
|
||||
Requires: libnozzle1%{_isa} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description -n libnozzle1-devel
|
||||
@ -300,8 +264,10 @@ Requires: pkgconfig
|
||||
%{_libdir}/libnozzle.so
|
||||
%{_includedir}/libnozzle.h
|
||||
%{_libdir}/pkgconfig/libnozzle.pc
|
||||
%if %{with buildman}
|
||||
%{_mandir}/man3/nozzle*.3.gz
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%package -n libknet1
|
||||
Summary: Kronosnet core switching implementation
|
||||
@ -317,7 +283,12 @@ License: LGPLv2+
|
||||
%{_libdir}/libknet.so.*
|
||||
%dir %{_libdir}/kronosnet
|
||||
|
||||
%if 0%{?ldconfig_scriptlets}
|
||||
%ldconfig_scriptlets -n libknet1
|
||||
%else
|
||||
%post -n libknet1 -p /sbin/ldconfig
|
||||
%postun -n libknet1 -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%package -n libknet1-devel
|
||||
Summary: Kronosnet core switching implementation (developer files)
|
||||
@ -335,11 +306,11 @@ Requires: pkgconfig
|
||||
%{_libdir}/libknet.so
|
||||
%{_includedir}/libknet.h
|
||||
%{_libdir}/pkgconfig/libknet.pc
|
||||
%if %{defined buildmanpages}
|
||||
%if %{with buildman}
|
||||
%{_mandir}/man3/knet*.3.gz
|
||||
%endif
|
||||
|
||||
%if %{defined buildcryptonss}
|
||||
%if %{with nss}
|
||||
%package -n libknet1-crypto-nss-plugin
|
||||
Summary: Provides libknet1 nss support
|
||||
License: LGPLv2+
|
||||
@ -352,7 +323,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
%{_libdir}/kronosnet/crypto_nss.so
|
||||
%endif
|
||||
|
||||
%if %{defined buildcryptoopenssl}
|
||||
%if %{with openssl}
|
||||
%package -n libknet1-crypto-openssl-plugin
|
||||
Summary: Provides libknet1 openssl support
|
||||
License: LGPLv2+
|
||||
@ -365,7 +336,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
%{_libdir}/kronosnet/crypto_openssl.so
|
||||
%endif
|
||||
|
||||
%if %{defined buildcompresszlib}
|
||||
%if %{with zlib}
|
||||
%package -n libknet1-compress-zlib-plugin
|
||||
Summary: Provides libknet1 zlib support
|
||||
License: LGPLv2+
|
||||
@ -377,7 +348,8 @@ Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
%files -n libknet1-compress-zlib-plugin
|
||||
%{_libdir}/kronosnet/compress_zlib.so
|
||||
%endif
|
||||
%if %{defined buildcompresslz4}
|
||||
|
||||
%if %{with lz4}
|
||||
%package -n libknet1-compress-lz4-plugin
|
||||
Summary: Provides libknet1 lz4 and lz4hc support
|
||||
License: LGPLv2+
|
||||
@ -391,7 +363,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
%{_libdir}/kronosnet/compress_lz4hc.so
|
||||
%endif
|
||||
|
||||
%if %{defined buildcompresslzo2}
|
||||
%if %{with lzo2}
|
||||
%package -n libknet1-compress-lzo2-plugin
|
||||
Summary: Provides libknet1 lzo2 support
|
||||
License: LGPLv2+
|
||||
@ -404,7 +376,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
%{_libdir}/kronosnet/compress_lzo2.so
|
||||
%endif
|
||||
|
||||
%if %{defined buildcompresslzma}
|
||||
%if %{with lzma}
|
||||
%package -n libknet1-compress-lzma-plugin
|
||||
Summary: Provides libknet1 lzma support
|
||||
License: LGPLv2+
|
||||
@ -417,7 +389,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
%{_libdir}/kronosnet/compress_lzma.so
|
||||
%endif
|
||||
|
||||
%if %{defined buildcompressbzip2}
|
||||
%if %{with bzip2}
|
||||
%package -n libknet1-compress-bzip2-plugin
|
||||
Summary: Provides libknet1 bzip2 support
|
||||
License: LGPLv2+
|
||||
@ -430,13 +402,26 @@ Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
%{_libdir}/kronosnet/compress_bzip2.so
|
||||
%endif
|
||||
|
||||
%if %{with zstd}
|
||||
%package -n libknet1-compress-zstd-plugin
|
||||
Summary: Provides libknet1 zstd support
|
||||
License: LGPLv2+
|
||||
Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
|
||||
%description -n libknet1-compress-zstd-plugin
|
||||
Provides zstd compression support for libknet1.
|
||||
|
||||
%files -n libknet1-compress-zstd-plugin
|
||||
%{_libdir}/kronosnet/compress_zstd.so
|
||||
%endif
|
||||
|
||||
%package -n libknet1-crypto-plugins-all
|
||||
Summary: Provides libknet1 crypto plugins meta package
|
||||
License: LGPLv2+
|
||||
%if %{defined buildcryptonss}
|
||||
%if %{with nss}
|
||||
Requires: libknet1-crypto-nss-plugin%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
%if %{defined buildcryptoopenssl}
|
||||
%if %{with openssl}
|
||||
Requires: libknet1-crypto-openssl-plugin%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
@ -448,21 +433,24 @@ Requires: libknet1-crypto-openssl-plugin%{_isa} = %{version}-%{release}
|
||||
%package -n libknet1-compress-plugins-all
|
||||
Summary: Provides libknet1 compress plugins meta package
|
||||
License: LGPLv2+
|
||||
%if %{defined buildcompresszlib}
|
||||
%if %{with zlib}
|
||||
Requires: libknet1-compress-zlib-plugin%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
%if %{defined buildcompresslz4}
|
||||
%if %{with lz4}
|
||||
Requires: libknet1-compress-lz4-plugin%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
%if %{defined buildcompresslzo2}
|
||||
%if %{with lzo2}
|
||||
Requires: libknet1-compress-lzo2-plugin%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
%if %{defined buildcompresslzma}
|
||||
%if %{with lzma}
|
||||
Requires: libknet1-compress-lzma-plugin%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
%if %{defined buildcompressbzip2}
|
||||
%if %{with bzip2}
|
||||
Requires: libknet1-compress-bzip2-plugin%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
%if %{with zstd}
|
||||
Requires: libknet1-compress-zstd-plugin%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description -n libknet1-compress-plugins-all
|
||||
Meta package to install all of libknet1 compress plugins
|
||||
@ -482,15 +470,14 @@ Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release}
|
||||
|
||||
%if %{with installtests}
|
||||
%package -n kronosnet-tests
|
||||
Group: System Environment/Libraries
|
||||
Summary: Provides kronosnet test suite
|
||||
Requires: libknet1 = %{version}-%{release}
|
||||
License: GPLv2+
|
||||
Requires: libknet1%{_isa} = %{version}-%{release}
|
||||
|
||||
%description -n kronosnet-tests
|
||||
This package contains all the libknet and libnozzle test suite
|
||||
This package contains all the libknet and libnozzle test suite.
|
||||
|
||||
%files -n kronosnet-tests
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/kronosnet/tests/*
|
||||
%endif
|
||||
|
||||
@ -499,6 +486,10 @@ Requires: libknet1 = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jun 12 2019 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.10-1
|
||||
- New upstream release
|
||||
- fix URL in spec file (rhbz#1708616)
|
||||
|
||||
* Thu May 09 2019 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.9-1
|
||||
- New upstream release
|
||||
|
||||
@ -508,4 +499,3 @@ Requires: libknet1 = %{version}-%{release}
|
||||
|
||||
* Wed Apr 03 2019 Madison Kelly <mkelly@alteeve.ca> - 1.8-1
|
||||
- Updated to upstream release v1.8.
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (kronosnet-1.9.tar.xz) = b9677f6a7944f4281c74954deebb77c4e848155c710b29ff1f3ba549df1b15638da56b8e222e6f8f2c9616710d97e5aa9d126b749b10e72c5c1dbf001c577538
|
||||
SHA512 (kronosnet-1.10.tar.xz) = 2d050a3d885471ac751dab6ad478079eeeef068bc9f8c9bab80e33e7f128fb3720beb83306704d1ab9d5260de20c824c599fb4c7b09a8e75dba65b400c5a65c5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user