From abcb341a93fbf130eadf93dc579d40e693eaad95 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 11 2021 04:19:19 +0000 Subject: import nmstate-1.2.0-0.1.alpha2.el8 --- diff --git a/.gitignore b/.gitignore index 1641c0f..ffc394e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -SOURCES/nmstate-1.2.0-alpha1.tar.gz +SOURCES/nmstate-1.2.0-alpha2.tar.gz +SOURCES/nmstate-rust-vendor-1.2.0-alpha2.tar.xz SOURCES/nmstate.gpg diff --git a/.nmstate.metadata b/.nmstate.metadata index 02e6dcf..25d633a 100644 --- a/.nmstate.metadata +++ b/.nmstate.metadata @@ -1,2 +1,3 @@ -4fc9c6f0f185bf053816459285f6e794391ac7a9 SOURCES/nmstate-1.2.0-alpha1.tar.gz +7fc72da3636565fb54070474d6f38d1f7bc55eed SOURCES/nmstate-1.2.0-alpha2.tar.gz +f4c0ded2a552e7a8c5d22ee9267cb9245827f487 SOURCES/nmstate-rust-vendor-1.2.0-alpha2.tar.xz b5f872551d434e2c62b30d70471efaeede83ab44 SOURCES/nmstate.gpg diff --git a/SOURCES/nmstate-1.2.0-alpha1.tar.gz.asc b/SOURCES/nmstate-1.2.0-alpha1.tar.gz.asc deleted file mode 100644 index 0eee793..0000000 --- a/SOURCES/nmstate-1.2.0-alpha1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8f1XsqXpyNthgIbGbM3lj+QeKP8FAmFlNAkACgkQbM3lj+Qe -KP+nMhAAhkWp1l4n5jl4Vfpwl2byW1/kv8GqDlADIKwcCNp3KKTDT4wEyJ+dcJJ1 -624p48aWt0nIa4e4DBLwXGLHvw2yuey4Bk+2X2W4nAW1mNTqb9IFHSzFW+Q++Vb8 -1ZXKv4iBzUhjLQ7gMtAw8kfjrecjnamTMP9yd7r/t1LecR5Q4/BxvtWaHY++Pk/f -in3K1DP0pMvXPVAahAybpyJoo1U4a17yNt5gm9GKh0pGHjfevXtRM7rTbIkMpUyN -yBGCuxojTviLNs7QI4H2k1oNwQ6LU864VwkE5yPOsZCxZKVtAf0Ccj6z+u7Jv/nL -Awc04ypg3awq7HBxfYU8taoKiSaEy33rajCvzqoaRseoxoX5B98sehEaiRoxGUlw -cidumX/75egLmrWXPg3RcOX7B0kFltIs1tAalDnh1iYLIPH8mo8+lo8vnHZatP3t -YVl/uc74bjpkSpDbRoV8rNyuRx19fPF5pK5W5cZeNV85iBcl4rlUtes5LA6ByMVJ -cQgVbv5FeyYz/4vB2LenVbGwZ18SMQN21umbgP+98v/VoBF51TpsfBaI9E3cPRPP -CDZb/rllDQxeONZyCMVIIruRleE2JeWXr9FSLMaQ6XnnCQ3b2WKFqdDGOWL8kMQB -ltyjx7b/Tt8OYHiuFS80b7QmdK2AjjlYQax9FlKzQx9u6yOfd6E= -=DZWy ------END PGP SIGNATURE----- diff --git a/SOURCES/nmstate-1.2.0-alpha2.tar.gz.asc b/SOURCES/nmstate-1.2.0-alpha2.tar.gz.asc new file mode 100644 index 0000000..7c87ca0 --- /dev/null +++ b/SOURCES/nmstate-1.2.0-alpha2.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE8f1XsqXpyNthgIbGbM3lj+QeKP8FAmGxgEYACgkQbM3lj+Qe +KP/8VA//Y46VjL5GpFhNiewwFdfpu/lpyqcLL2QJaeVgw2RncAch5RuuN9FhV0vS +/jLSc3M2UVC9Li57w4oYZOfqYgGxPMedtUQtzFnzWpBF+JzQ18M106E7cUjuNot6 ++Vw+uSf/fqfWLiahChW61MUUFYn2S6c6m09OD/s4zvMQDf1tltZ9BxGuWwyLeoHS +p3N3iCNxW2QRCJx/0lhGDqyie251xWsB6R/+pmks8DD8i6s28a2Gh2J+APtbcLTT +DqeJDd6+OzwqM/3tAZPK7huolMGixUAPqm1/+EDfutBAQvZLyshEFe5XTjr36rvw +hQGdjRbRVFX+RNNbREHodgh+lcsYkVGhHGX2CgSrKuGpZqbrTPNZu/h85pn8vjdX +VSB7zD7C2UCf3QC9OcNOGzVafMzgfXYIbfzxtaPj2ckJy3uZIfrphZfeEzZoG7Cn +obRdUHRjWeup8VFTOe2Wf142IFQ4HFPwWaHGABSjzJmclIqPpaMJ9JX55F/CUMAF +obda0WL/ZQVQVMAMW8IlE3ojDcwYhAwDbmakGd8Mx15efOW7A50Cq+mg8XE8Tfuu +ZsZnyidjznDXZAyltqGl00vnXQeNfk0FIAqWMh4o/6TJ1eS2VQw26BrNEXz1h2tc +YyEybU9TvkegegOF8t2CDkD7mXSefg4kuDSal0H7Sb8cDJsWOAc= +=n6AN +-----END PGP SIGNATURE----- diff --git a/SPECS/nmstate.spec b/SPECS/nmstate.spec index 1da0680..44c0f81 100644 --- a/SPECS/nmstate.spec +++ b/SPECS/nmstate.spec @@ -4,17 +4,19 @@ Name: nmstate Version: 1.2.0 -Release: 0.1.alpha1%{?dist} +Release: 0.1.alpha2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} -Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha1.tar.gz -Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha1.tar.gz.asc +Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha2.tar.gz +Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha2.tar.gz.asc Source2: https://www.nmstate.io/nmstate.gpg -BuildArch: noarch +Source3: nmstate-rust-vendor-%{version}-alpha2.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} @@ -27,6 +29,7 @@ provider support on the southbound. %package -n python3-%{libname} Summary: nmstate Python 3 API library +BuildArch: noarch Requires: NetworkManager-libnm >= 1:1.26.0 # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host @@ -42,11 +45,28 @@ Requires: python3dist(varlink) %package -n nmstate-plugin-ovsdb Summary: nmstate plugin for OVS database manipulation +BuildArch: noarch Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} # The python-openvswitch rpm pacakge is not in the same repo with nmstate, # hence state it as Recommends, no requires. Recommends: python3dist(ovs) + +%package libs +Summary: C binding of nmstate +License: ASL 2.0 + +%package devel +Summary: C binding development files of nmstate +License: ASL 2.0 +Requires: nmstate-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description libs +This package contains the C binding of nmstate. + +%description devel +This package contains the C binding development files of nmstate. + %description -n python3-%{libname} This package contains the Python 3 library for nmstate. @@ -58,11 +78,32 @@ gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgke gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %autosetup -p1 +pushd rust +# Source3 is vendored dependencies +%cargo_prep -V 3 + +# The cargo_prep will create `.cargo/config` which take precedence over +# `.cargo/config.toml` shipped by upstream which fix the SONAME of cdylib. +# To workaround that, merge upstream rustflags into cargo_prep created one. +_FLAGS=`sed -ne 's/rustflags = "\(.\+\)"/\1/p' .cargo/config.toml` +sed -i -e "s/rustflags = \[\(.\+\), \]$/rustflags = [\1, \"$_FLAGS\"]/" \ + .cargo/config +rm .cargo/config.toml + +popd + %build %py3_build +pushd rust +make +popd + %install %py3_install +pushd rust +env SKIP_PYTHON_INSTALL=1 PREFIX=%{_prefix} LIBDIR=%{_libdir} %make_install +popd %files %doc README.md @@ -71,6 +112,7 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{_mandir}/man8/nmstate-autoconf.8* %{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl +%{_bindir}/nmstatectl-rust %{_bindir}/nmstate-autoconf %files -n python3-%{libname} @@ -84,7 +126,26 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_ovsdb* %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* +%files libs +%license rust/LICENSE +%{_libdir}/libnmstate.so.* + +%files devel +%license LICENSE +%{_libdir}/libnmstate.so +%{_includedir}/nmstate.h +%{_libdir}/pkgconfig/nmstate.pc + +%post libs +/sbin/ldconfig + +%postun libs +/sbin/ldconfig + %changelog +* Thu Dec 09 2021 Gris Ge - 1.2.0-0.1.alpha2 +- Upgrade to 1.2.0 alpha2. RHBZ#1996618 + * Tue Oct 12 2021 Gris Ge - 1.2.0-0.1.alpha1 - Upgrade to 1.2.0 alpha1.