Upgrade to 2.1.0
Resolves: RHBZ#2061796 Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
parent
feb74760e9
commit
4996a651b1
14
.gitignore
vendored
14
.gitignore
vendored
@ -87,3 +87,17 @@
|
||||
/nmstate-2.1.0-alpha.20220407.tar.gz
|
||||
/nmstate-2.1.0-alpha.20220407.tar.gz.asc
|
||||
/nmstate-rust-vendor-2.1.0-alpha.20220407.tar.xz
|
||||
/nmstate-2.1.0-alpha.20220419.f9bee421.tar.gz.asc
|
||||
/nmstate-2.1.0-alpha.20220419.f9bee421.tar.gz
|
||||
/nmstate-alpha-2.1.0-20220419-b5e4c56d.tar.gz
|
||||
/nmstate-alpha-2.1.0-20220419-b5e4c56d.tar.gz.asc
|
||||
/nmstate-vendor-2.1.0-20220419-b5e4c56d.tar.xz
|
||||
/nmstate-2.1.0-alpha-20220419-fbc64eb7.tar.gz
|
||||
/nmstate-2.1.0-alpha-20220419-fbc64eb7.tar.gz.asc
|
||||
/nmstate-vendor-2.1.0-20220419-fbc64eb7.tar.xz
|
||||
/nmstate-2.1.0-alpha.20220419.d613311d.tar.gz
|
||||
/nmstate-2.1.0-alpha.20220419.d613311d.tar.gz.asc
|
||||
/nmstate-vendor-2.1.0.20220419.d613311d.tar.xz
|
||||
/nmstate-2.1.0.tar.gz
|
||||
/nmstate-2.1.0.tar.gz.asc
|
||||
/nmstate-vendor-2.1.0.tar.xz
|
||||
|
77
nmstate.spec
77
nmstate.spec
@ -4,21 +4,19 @@
|
||||
|
||||
Name: nmstate
|
||||
Version: 2.1.0
|
||||
Release: 0.alpha.20220407%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: Declarative network manager API
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/%{srcname}/%{srcname}
|
||||
Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha.20220407.tar.gz
|
||||
Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha.20220407.tar.gz.asc
|
||||
Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz
|
||||
Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc
|
||||
Source2: nmstate.gpg
|
||||
Source3: nmstate-rust-vendor-%{version}-alpha.20220407.tar.xz
|
||||
Source3: nmstate-vendor-%{version}.tar.xz
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: rust-toolset
|
||||
BuildRequires: pkg-config
|
||||
Requires: python3-setuptools
|
||||
Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
%description
|
||||
Nmstate is a library with an accompanying command line tool that manages host
|
||||
@ -27,39 +25,30 @@ needs to manage host networking through a northbound declarative API and multi
|
||||
provider support on the southbound.
|
||||
|
||||
|
||||
%package -n python3-%{libname}
|
||||
Summary: nmstate Python 3 API library
|
||||
BuildArch: noarch
|
||||
Requires: NetworkManager-libnm >= 1:1.26.0
|
||||
%package libs
|
||||
Summary: C binding of nmstate
|
||||
# Use Recommends for NetworkManager because only access to NM DBus is required,
|
||||
# but NM could be running on a different host
|
||||
Recommends: NetworkManager
|
||||
# Avoid automatically generated profiles
|
||||
Recommends: NetworkManager-config-server
|
||||
License: ASL 2.0
|
||||
|
||||
%package -n python3-%{libname}
|
||||
Summary: nmstate Python 3 API library
|
||||
# Use Recommends for NetworkManager because only access to NM DBus is required,
|
||||
# but NM could be running on a different host
|
||||
Recommends: NetworkManager
|
||||
# Avoid automatically generated profiles
|
||||
Recommends: NetworkManager-config-server
|
||||
Recommends: (nmstate-plugin-ovsdb if openvswitch)
|
||||
# Use Suggests for NetworkManager-ovs and NetworkManager-team since it is only
|
||||
# required for OVS and team support
|
||||
Suggests: NetworkManager-ovs
|
||||
Suggests: NetworkManager-team
|
||||
# FIXME: Once upstream included nispor into requirement.txt, remove below line
|
||||
Requires: python3dist(nispor)
|
||||
|
||||
%package -n nmstate-plugin-ovsdb
|
||||
Summary: nmstate plugin for OVS database manipulation
|
||||
BuildArch: noarch
|
||||
Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel}
|
||||
# The python-openvswitch rpm package is not in the same repo with nmstate,
|
||||
# require only if openvswitch is installed.
|
||||
Requires: (python3dist(ovs) if openvswitch)
|
||||
Recommends: python3dist(ovs)
|
||||
%else
|
||||
Requires: python3dist(ovs)
|
||||
%endif
|
||||
|
||||
%package libs
|
||||
Summary: C binding of nmstate
|
||||
License: ASL 2.0
|
||||
Provides: nmstate-plugin-ovsdb = %{version}-%{release}
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: nmstate-plugin-ovsdb < 2.1-1
|
||||
|
||||
%package devel
|
||||
Summary: C binding development files of nmstate
|
||||
@ -76,9 +65,6 @@ This package contains the C binding development files of nmstate.
|
||||
%description -n python3-%{libname}
|
||||
This package contains the Python 3 library for Nmstate.
|
||||
|
||||
%description -n nmstate-plugin-ovsdb
|
||||
This package contains the nmstate plugin for OVS database manipulation.
|
||||
|
||||
%prep
|
||||
gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg
|
||||
gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0}
|
||||
@ -99,34 +85,33 @@ rm .cargo/config.toml
|
||||
popd
|
||||
|
||||
%build
|
||||
pushd rust/src/python
|
||||
%py3_build
|
||||
popd
|
||||
pushd rust
|
||||
%cargo_build
|
||||
popd
|
||||
|
||||
%install
|
||||
%py3_install
|
||||
pushd rust
|
||||
env SKIP_PYTHON_INSTALL=1 PREFIX=%{_prefix} LIBDIR=%{_libdir} %make_install
|
||||
|
||||
pushd rust/src/python
|
||||
%py3_install
|
||||
popd
|
||||
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%doc examples/
|
||||
%{_mandir}/man8/nmstatectl.8*
|
||||
%{_mandir}/man8/nmstate-autoconf.8*
|
||||
%{python3_sitelib}/nmstatectl
|
||||
%{_bindir}/nmstatectl
|
||||
%{_bindir}/nmstate-autoconf
|
||||
%{_bindir}/nmstatectl-rust
|
||||
|
||||
%files -n python3-%{libname}
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/%{libname}
|
||||
%{python3_sitelib}/%{srcname}-*.egg-info/
|
||||
%exclude %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_*
|
||||
%exclude %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_*
|
||||
|
||||
%files -n nmstate-plugin-ovsdb
|
||||
%{python3_sitelib}/%{libname}/plugins/nmstate_plugin_ovsdb*
|
||||
%{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb*
|
||||
|
||||
%files libs
|
||||
%license rust/LICENSE
|
||||
@ -145,11 +130,17 @@ popd
|
||||
/sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Fri Apr 22 2022 Gris Ge <fge@redhat.com> - 2.1.0-1
|
||||
- Upgrade to 2.1.0
|
||||
|
||||
* Tue Apr 19 2022 Gris Ge <fge@redhat.com> - 2.1.0-0.alpha.20220419.d613311d
|
||||
- Upgrade to nmstate-2.1.0-0.alpha.20220419.d613311d
|
||||
|
||||
* Thu Apr 07 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.0-0.alpha.20220407
|
||||
- Upgrade to nmstate-2.1.0-0.alpha.20220407
|
||||
|
||||
* Fri Mar 11 2022 Gris Ge <fge@redhat.com> - 2.1.0-0.alpha.20220311.6f7c2be
|
||||
Upgrade to nmstate-2.1.0-0.alpha.20220311.6f7c2be
|
||||
- Upgrade to nmstate-2.1.0-0.alpha.20220311.6f7c2be
|
||||
|
||||
* Thu Feb 24 2022 Gris Ge <fge@redhat.com> - 2.0.0-2
|
||||
- Force python3-libnmstate and nmstate-plugin-ovsdb as noarch. RHBZ#1996575
|
||||
|
6
sources
6
sources
@ -1,4 +1,4 @@
|
||||
SHA512 (nmstate-2.1.0.tar.gz) = 52f4f3076e8efc7fb940a999a659488e1162253056e2dcab73cf1cc17e1fe2d8f64b5e5b7d343486eaf61926702a10a1d899ef68adfa19667e610d2ec5b7815c
|
||||
SHA512 (nmstate-2.1.0.tar.gz.asc) = 044914887be2edea22260a9cee7fd53fc0c3e9fd640aa8fcc353f064a548e23a1ecb6fd09c9d23342f8839c917edfac686ff33c5ac40563802838da3103c7309
|
||||
SHA512 (nmstate-vendor-2.1.0.tar.xz) = fb1512fe950c6d5895d11044a209387dac4b7c20b45677bc7e812196fc0f1045bdf542f5dab5af78509d9ac631d23af32cbdfb02492ee5358e199dbc463f1e89
|
||||
SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309
|
||||
SHA512 (nmstate-2.1.0-alpha.20220407.tar.gz) = 1193a42b918c3cdfbd65ee3d90339b245c918b0cbe04c443c97636066fba0efab6e86d262dae77cbe78117e9904ad2b55145e4b12e2f19e26cf7317603ae522d
|
||||
SHA512 (nmstate-2.1.0-alpha.20220407.tar.gz.asc) = 9e5fe6e4ad4feb4e2bd28a662af220dea180739106eaf778af75afd8970fdabfc75c57c5bee03edfd5f90d1bfadfaf4fb5b3734cffbadc6443c1c415fce37ccd
|
||||
SHA512 (nmstate-rust-vendor-2.1.0-alpha.20220407.tar.xz) = a54d422799953f6deeb88aa06b6fe3ecd7a9fd7b9aa9c0e9fb894933cb3fa264bddd8ce62999814b3db04b0acdcab909524eecf6031af9a1ecd5995d4e363323
|
||||
|
Loading…
Reference in New Issue
Block a user