diff --git a/.gitignore b/.gitignore index 8d49ec2..058eb63 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/nmstate-2.0.0.tar.gz -SOURCES/nmstate-rust-vendor-2.0.0.tar.xz +SOURCES/nmstate-2.1.4.tar.gz +SOURCES/nmstate-vendor-2.1.4.tar.xz SOURCES/nmstate.gpg diff --git a/.nmstate.metadata b/.nmstate.metadata index 32e9077..5306f60 100644 --- a/.nmstate.metadata +++ b/.nmstate.metadata @@ -1,3 +1,3 @@ -8be52210e6247ee6d18d8218c185a2968532eb66 SOURCES/nmstate-2.0.0.tar.gz -6415c1d380e3c2e68f92c953cef7cbca094c74b7 SOURCES/nmstate-rust-vendor-2.0.0.tar.xz -b5f872551d434e2c62b30d70471efaeede83ab44 SOURCES/nmstate.gpg +a35f8ea70135883db792e42d8137dd70f4c38699 SOURCES/nmstate-2.1.4.tar.gz +bab6a2cf4190bba15bce5818836c4679d8409e14 SOURCES/nmstate-vendor-2.1.4.tar.xz +5c1d9d65f9db4fedc9dc96e0fb6cac0a86749c88 SOURCES/nmstate.gpg diff --git a/SOURCES/nmstate-2.0.0.tar.gz.asc b/SOURCES/nmstate-2.0.0.tar.gz.asc deleted file mode 100644 index c316152..0000000 --- a/SOURCES/nmstate-2.0.0.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEfUQ+BAINyWGvqJXerIciWuEsPqMFAmILbucACgkQrIciWuEs -PqPiURAAkvgC74BcGgRh6s17VEGyZfQIDFDp2vzqDHraQR7wB2+sLhoLb/txM0eB -rMTsbBI945BP12kN9nVDbmmFar3ibFg/JWcwb3XDxIc4xEnozzDcpCHlX/hLuMcJ -Z3gXKlxPCgUv19SiNPWuxXhQIN3ij0NpaUhSOZ+eBnVeX8M9N9xviMwpQUIbqMOM -HACX6NpMKZDZywpuZ16eWf7AE1TWEkv1Go5bvra3ue47RZO67RNJNVYFML/SfbgD -Qj82bVL4Y9JjoBrKJ10sJN3xDBvI2w6aaga1gsqNowHPAR7FaTlqNyJT6fP1qrFO -qWTi4+bBWWBE3C/MEPvxP8BFMJmLalPBBXpdPyHAn0IB9Njl3zsDhYQyknmXgYpU -HYSGWMIG0g1jqI1vA8dKE476ZVaovQuC16pQcrxmoC5w4d+Ba6IXyNouvh/UmPTa -Z5O09mpm2NR9EKmSRpdFpn3cVOXSx3DlkGGjWDmpHil1MSO2gNyO4RJnvTo89Hj6 -JCx+68WSzRYyEWoCYJSulS21rDt1M0aU99f63CqxLMwOQ2I+Whe9gKA6sybvRqu0 -GOjUHvuuFNKtlof0zkIvjZBEjQuOwZZxVZh6IGtYiI2o4ZlnVJxeDfGANnrcFd9r -nM0owbwFxwSaeN7yWbc5YafkCPXXzOwszbQhZ9fVDlKU0fpASaI= -=TfNK ------END PGP SIGNATURE----- diff --git a/SOURCES/nmstate-2.1.4.tar.gz.asc b/SOURCES/nmstate-2.1.4.tar.gz.asc new file mode 100644 index 0000000..c5eb881 --- /dev/null +++ b/SOURCES/nmstate-2.1.4.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEfUQ+BAINyWGvqJXerIciWuEsPqMFAmL1HPsACgkQrIciWuEs +PqMATQ/7BNE44Uy4/TU5d3I3CIGADWxWtoAT+xeTydDi2ohRKI23nKLzVvBgUXXu +thnn8trzGv8i4dKmFif2ZmM83Tgo8chYmpHuDkT7x/W21/BAaz9+CpX/O+vdibV3 +BdGCqDiAJ2zOrVsYHooMplgydUumlkBxHwm8suOHm3fMROPLRsIZD7643PGXKHtY ++u1moRTwwIVRrgLLu6wCYjNaXv96qycusrKRnVhN2EQ4Kg1W/aoWbVUJiOCHKr83 +KSa67yWJkA1w/xuSxXOuC9Ci1PZ42x25B56VyHazoHFwUcZhNXN325a5mU3cNM9A +SeAkNL9cajutGgIIemtiGpteB+1fElg3jDBIJKldnpO6gnr4VJB/kREMz61hUHFu +Gz+007GuYh22gzUFPAD7nChx4+BJWHpms+1gVMOJhN7Q32ch4+7wT1ZRPu1C6G8J +UR0MGl3r9hFiCWSRRlY//hFZwg96Vy16eiwTSrRchb71+4txEl8EEDGOiFLi2hj0 +jQUF5D9FAURwQ1eSqEl6hiALZGVO2Ld2VcKipDgOK1YgppIojeNOq4rWyhwRfpBX +JzhcAKDhPFvLpNuum6Icdkg2o/gRjlf3X2+KBIAY/16ZkGg5156snWExmXwpvTx7 +4o/biIFXixxWQG5S9PUFfvmbLDrG+KTUS92UQcxl2w3P/PsK6sY= +=fZcn +-----END PGP SIGNATURE----- diff --git a/SPECS/nmstate.spec b/SPECS/nmstate.spec index e8089a7..2240bdb 100644 --- a/SPECS/nmstate.spec +++ b/SPECS/nmstate.spec @@ -3,22 +3,21 @@ %define libname libnmstate Name: nmstate -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.1.4 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} -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}.tar.xz +Source0: https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-%{version}.tar.gz +Source1: https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-%{version}.tar.gz.asc +Source2: https://nmstate.io/nmstate.gpg +Source3: https://github.com/nmstate/nmstate/releases/download/v%{version}/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} +BuildRequires: systemd %description Nmstate is a library with an accompanying command line tool that manages host @@ -27,45 +26,44 @@ needs to manage host networking through a northbound declarative API and multi provider support on the southbound. +%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 -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 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 License: ASL 2.0 Requires: nmstate-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%package static +Summary: Static development files for nmstate +Group: Development/Libraries +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +Static C library bindings for nmstate. + %description libs This package contains the C binding of nmstate. @@ -76,9 +74,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,38 +94,41 @@ rm .cargo/config.toml popd %build +pushd rust/src/python %py3_build - +popd pushd rust -make +%cargo_build popd %install +env SKIP_PYTHON_INSTALL=1 \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + SYSCONFDIR=%{_sysconfdir} \ + %make_install + +pushd rust/src/python %py3_install -pushd rust -env SKIP_PYTHON_INSTALL=1 PREFIX=%{_prefix} LIBDIR=%{_libdir} %make_install popd + %files %doc README.md %doc examples/ +%{_mandir}/man8/nmstate.service.8* %{_mandir}/man8/nmstatectl.8* %{_mandir}/man8/nmstate-autoconf.8* -%{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl %{_bindir}/nmstate-autoconf -%{_bindir}/nmstatectl-rust +%{_unitdir}/nmstate.service +%dir %{_sysconfdir}/%{name} +%{_sysconfdir}/%{name}/README %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 @@ -142,6 +140,9 @@ popd %{_includedir}/nmstate.h %{_libdir}/pkgconfig/nmstate.pc +%files static +%{_libdir}/libnmstate.a + %post libs /sbin/ldconfig @@ -149,6 +150,42 @@ popd /sbin/ldconfig %changelog +* Mon Aug 15 2022 Gris Ge - 2.1.4-1 +- Upgrade to 2.1.4 + +* Thu Jul 28 2022 Gris Ge - 2.1.3-1 +- Upgraded to 2.1.3 + +* Wed Jul 20 2022 Fernando Fernandez Mancera - 2.1.3-20220720.cf972e4d +- Upgrade to nmstate-2.1.3-20220720.cf972e4d + +* Thu Jul 14 2022 Gris Ge - 2.1.3-20220714.81d80992 +- Upgrade to nmstate-2.1.3-20220714.81d80992 + +* Thu Jun 30 2022 Fernando Fernandez Mancera - 2.1.2-1 +- Upgrade to 2.1.2 + +* Mon Jun 13 2022 Fernando Fernandez Mancera - 2.1.1-1 +- Upgrade to 2.1.1 + +* Thu Jun 02 2022 Fernando Fernandez Mancera - 2.1.1-0.alpha.20220602.5accbd1 +- Upgrade to nmstate-2.1.1-0.alpha.20220602.5accbd1 + +* Thu May 19 2022 Fernando Fernandez Mancera - 2.1.1-0.alpha.20220519.437e4a9 +- Upgrade to nmstate-2.1.1-0.alpha.20220519.437e4a9 + +* Fri Apr 22 2022 Gris Ge - 2.1.0-1 +- Upgrade to 2.1.0 + +* Tue Apr 19 2022 Gris Ge - 2.1.0-0.alpha.20220419.d613311d +- Upgrade to nmstate-2.1.0-0.alpha.20220419.d613311d + +* Thu Apr 07 2022 Fernando Fernandez Mancera - 2.1.0-0.alpha.20220407 +- Upgrade to nmstate-2.1.0-0.alpha.20220407 + +* Fri Mar 11 2022 Gris Ge - 2.1.0-0.alpha.20220311.6f7c2be +- Upgrade to nmstate-2.1.0-0.alpha.20220311.6f7c2be + * Thu Feb 24 2022 Gris Ge - 2.0.0-2 - Force python3-libnmstate and nmstate-plugin-ovsdb as noarch. RHBZ#1996575