import nmstate-2.0.0-0.7.alpha6.el9

2022-02-01 12:35:53 -05:00 · 2022-02-01 12:35:53 -05:00 · 71e07bec49
commit 71e07bec49
parent 24d0191abf
5 changed files with 92 additions and 22 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
-SOURCES/nmstate-2.0.0-alpha3.tar.gz
+SOURCES/nmstate-2.0.0-alpha6.tar.gz
+SOURCES/nmstate-rust-vendor-2.0.0-alpha6.tar.xz
 SOURCES/nmstate.gpg
--- a/.nmstate.metadata
+++ b/.nmstate.metadata
@ -1,2 +1,3 @@
-b3dedbf6d990963833bff854be23f76c1473837a SOURCES/nmstate-2.0.0-alpha3.tar.gz
+965156e44bd36183709e2b382c06ac68821cb2e8 SOURCES/nmstate-2.0.0-alpha6.tar.gz
+12d298d8f41047f48d07f84156b386fefaa998a1 SOURCES/nmstate-rust-vendor-2.0.0-alpha6.tar.xz
 b5f872551d434e2c62b30d70471efaeede83ab44 SOURCES/nmstate.gpg
--- a/SOURCES/nmstate-2.0.0-alpha3.tar.gz.asc
+++ b/SOURCES/nmstate-2.0.0-alpha3.tar.gz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEfUQ+BAINyWGvqJXerIciWuEsPqMFAmE7HegACgkQrIciWuEs
-PqMtpA/7BRfX1POiRFJoonqp8enYhPciwCbeEgaIeqSC9SgDq26jzlEVymXNXUgG
-7ONkPrfsJII6biZeSfDx7q9J7QLrhpeMjnqDNTB3gvXX+9Kht8kbeBzgK8r8H1zH
-yfJTQ/GIHSjRN0GYLJNjERGPUpsSlvZJ8e3T3cwIYV+LObz1ziYBrUGeOJh1IAsG
-nUFF//xEC/OjyezE9R2TOxVRfl54vjPe7OYoRhHyzpCMZV0uOLe38RGljUt0LuOa
-6+u9nOfwbPvyRkNoDCVQXzr8rgKJ+/4VTqh++5Z6pHqTNsBXWxTXnc7YlEM3ei7d
-IiWjpCurDnE3hqQPnWfsqTSTUb/1VODKqci+vCFgIm/QHSmH68a2EcZrS5cxFyWe
-sIikYETa/8/TIrYxOqDBGSMqMAOZgSF6yMxzHekVTQK7i+S5QZA/pjnmfFqqeasx
-6q3oXN/5tEqA5l0ezKUc0+uNv2GMxZNgc4mSa9n41pwqUqCov+/8w6hUVCzaeky0
-bzBxpMHpGs8Cl3RzBBbYnRv81NHnDlcljoUZWtFhyRR8wrLuBXrZeavAwEtuBOJ/
-eLqlPijNPR2LMT+dUee0dsWGtCRKGUunobPM//5tqtU75HkL2F6eVpaMVx8GzVpQ
-YOYe0wn4MuoL/ulI81dqfFEErKytb++J0psq84ivbNrlI1g2HYU=
-=/khD
-----END PGP SIGNATURE-----
--- a/SOURCES/nmstate-2.0.0-alpha6.tar.gz.asc
+++ b/SOURCES/nmstate-2.0.0-alpha6.tar.gz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE8f1XsqXpyNthgIbGbM3lj+QeKP8FAmHf0RQACgkQbM3lj+Qe
+KP99hg//c2S1KEgPocJDZ692u4WIq/L9MK6wvrgGKhubLI9oxXrLnBE6ZJm6rnaj
+eR6fhh5JkH5ic1a96a+4716tL1yNIr4AW+gqsnCBWA57cmEQHkSp0gDjAw6koT7u
+B4jAQM9e4eBiW2Reu8YDoxteFrX6gG+IACNEl+mvhyP74dVli4r5TWYVb/QdpFES
+5/w5i2H0RNjFb6ABQbQXdilVaxqeaf5HTkHxnqRl0VAqyR0c9LDqDcsOh7vWbN/o
+kNDTCJrEuAxp29T+wx2Yabb51xsYVuu7nWSdGfN1gWvMBDGoH6LzYMxeB0wh5hAm
+/KfPIDYLJZx4PO7Lav2bzzvdc+Ru0RobvRCwYjIyEEXuYcwOimuDyf7jRul4wRVi
+qYvRpFMykKgapqHgJBVbmyqiDtOtm2G/g0OARSjgUFW4qRDZoboyZLNHmabu4Nex
+JZXhLT6e3Xoh3ooba8XGvOlFvJagW/U9LjbCnYgce5Q5a5l9RN0HxgTEUG/kCvWX
+frWe5WcqbrOU7AiCfao5HIMrVaVU2a+bUpVOxr8DpT9DUiCSEVTGeL2uruYkcW5B
+GNKiiY2Lih707Z57U6ChZumxaQL0Ek4uwhTtZfvL7VElFuY/pL7/QW27YZeBB7mz
+DsHdNomaXJ/PALAvbwpBAiYq8x6zWdXPp1wc8cCKQWIgBy+7Qcg=
+=eNRK
+-----END PGP SIGNATURE-----
--- a/SPECS/nmstate.spec
+++ b/SPECS/nmstate.spec
@ -4,17 +4,19 @@

 Name:           nmstate
 Version:        2.0.0
-Release:        0.4.alpha3%{?dist}
+Release:        0.7.alpha6%{?dist}
 Summary:        Declarative network manager API
 License:        LGPLv2+
 URL:            https://github.com/%{srcname}/%{srcname}
-Source0:        %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha3.tar.gz
-Source1:        %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha3.tar.gz.asc
+Source0:        %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha6.tar.gz
+Source1:        %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha6.tar.gz.asc
 Source2:        nmstate.gpg
-BuildArch:      noarch
+Source3:        nmstate-rust-vendor-%{version}-alpha6.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}

@ -53,6 +55,21 @@ Recommends:     python3dist(ovs)
 Requires:       python3dist(ovs)
 %endif

+%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.
@ -65,11 +82,32 @@ gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgke
 gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0}
 %setup -q

+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
@ -79,6 +117,7 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0}
 %{python3_sitelib}/nmstatectl
 %{_bindir}/nmstatectl
 %{_bindir}/nmstate-autoconf
+%{_bindir}/nmstatectl-rust

 %files -n python3-%{libname}
 %license LICENSE
@ -91,7 +130,36 @@ 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 Jan 13 2022 Gris Ge <fge@redhat.com> - 2.0.0-0.7.alpha6
+- Add gating.yaml. RHBZ#1996575
+
+* Wed Jan 12 2022 Gris Ge <fge@redhat.com> - 2.0.0-0.6.alpha6
+- Upgrade to 2.0.0. alpha 6. Resolves: RHBZ#1996575
+
+* Thu Dec 16 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.0.0-0.5.alpha5
+- Upgrade to 2.0.0 alpha 5. Resolves: RHBZ#1996575
+- Fix release number.
+
+* Thu Dec 09 2021 Gris Ge <fge@redhat.com> - 2.0.0-0.1.alpha4
+- Upgrade to 2.0.0 alpha 4. Resolves: RHBZ#1996575
+
 * Thu Sep 23 2021 Ana Cabral <acabral@redhat.com> - 2.0.0-0.4.alpha3
 - Upgrade to 2.0.0 alpha 3. Resolves: RHBZ#1996575
 - Remove connection renaming behaviour. Resolves: RHBZ#1998222