From 1b919fdbcb68d0c0d0dfcbd3df9d45bffe704fd9 Mon Sep 17 00:00:00 2001
From: Gris Ge <fge@redhat.com>
Date: Tue, 19 Apr 2022 14:18:02 +0800
Subject: [PATCH] Upgrade to 2.1.0.alpha2

Signed-off-by: Gris Ge <fge@redhat.com>
---
 .gitignore   |  2 ++
 nmstate.spec | 53 +++++++---------------------------------------------
 sources      |  4 ++--
 3 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index f56cc12..bd806e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,5 @@
 /nmstate-2.0.0.tar.gz.asc
 /nmstate-2.1.0-alpha1.tar.gz
 /nmstate-2.1.0-alpha1.tar.gz.asc
+/nmstate-2.1.0-alpha2.tar.gz
+/nmstate-2.1.0-alpha2.tar.gz.asc
diff --git a/nmstate.spec b/nmstate.spec
index 5b445e8..4b2e24f 100644
--- a/nmstate.spec
+++ b/nmstate.spec
@@ -3,12 +3,12 @@
 
 Name:           nmstate
 Version:        2.1.0
-Release:        0.1.alpha1%{?dist}
+Release:        0.2.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:        nmstate.gpg
 BuildRequires:  patchelf
 BuildRequires:  python3-devel
@@ -75,7 +75,6 @@ Suggests:       NetworkManager-team
 Provides:       nmstate-plugin-ovsdb = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Obsoletes:      nmstate-plugin-ovsdb < 2.0-1
-BuildArch:      noarch
 
 %description -n python3-%{libname}
 This package contains the Python 3 library for Nmstate.
@@ -101,61 +100,23 @@ pushd rust/src/python
 popd
 
 %install
-# We do manual install here before upstream has it
-pushd rust
-install -D --mode 0755 target/release/libnmstate.so \
-    %{buildroot}/%{_libdir}/libnmstate.so.%{version}
-ln -s libnmstate.so.%{version} %{buildroot}/%{_libdir}/libnmstate.so.2
-ln -s libnmstate.so.%{version} %{buildroot}/%{_libdir}/libnmstate.so
+env SKIP_PYTHON_INSTALL=1 \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libdir} \
+    %make_install
 patchelf --set-soname libnmstate.so.2 \
     %{buildroot}/%{_libdir}/libnmstate.so.%{version}
 
-install -D --mode 0755 target/release/nmstatectl-rust \
-    %{buildroot}/%{_bindir}/nmstatectl
-ln -s nmstatectl %{buildroot}/%{_bindir}/nmstatectl-rust
-ln -s nmstatectl %{buildroot}/%{_bindir}/nmstate-autoconf
-popd
-install -D --mode 0644 nmstatectl.8 \
-    %{buildroot}/%{_mandir}/man8/nmstatectl.8
-install -D --mode 0644 nmstate-autoconf.8 \
-    %{buildroot}/%{_mandir}/man8/nmstate-autoconf.8
-gzip %{buildroot}/%{_mandir}/man8/nmstatectl.8
-gzip %{buildroot}/%{_mandir}/man8/nmstate-autoconf.8
-
 pushd rust/src/python
 %py3_install
 popd
 
-pushd rust/src/clib
-install -D --mode 0644 nmstate.h.in %{buildroot}/%{_includedir}/nmstate.h
-MAJOR_VERSION=$(echo %{version} | cut -f1 -d.)
-MINOR_VERSION=$(echo %{version} | cut -f2 -d.)
-MICRO_VERSION=$(echo %{version} | cut -f3 -d.)
-sed -i -e "s#@_VERSION_MAJOR@#${MAJOR_VERSION}#" \
-    %{buildroot}/%{_includedir}/nmstate.h
-sed -i -e "s#@_VERSION_MINOR@#${MINOR_VERSION}#" \
-    %{buildroot}/%{_includedir}/nmstate.h
-sed -i -e "s#@_VERSION_MICRO@#${MICRO_VERSION}#" \
-    %{buildroot}/%{_includedir}/nmstate.h
-
-install -D --mode 0644 nmstate.pc.in %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc
-sed -i -e "s#@PREFIX@#%{_prefix}#" \
-    %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc
-sed -i -e "s#@LIBDIR@#%{_libdir}#" \
-    %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc
-sed -i -e "s#@INCLUDE_DIR@#%{_includedir}#" \
-    %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc
-sed -i -e "s#@VERSION@#%{version}#" \
-    %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc
-popd
-
 %files
 %doc README.md
 %doc examples/
 %{_mandir}/man8/nmstatectl.8*
 %{_mandir}/man8/nmstate-autoconf.8*
 %{_bindir}/nmstatectl
-%{_bindir}/nmstatectl-rust
 %{_bindir}/nmstate-autoconf
 
 %files libs
diff --git a/sources b/sources
index 3ac99ab..d062a98 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (nmstate-2.1.0-alpha1.tar.gz) = 540121a850a070f4e19591d05027c4b1f596d9b40599f3c667f7b4e9dbe8d84269b94867fbf48891add4b86d731e139931d304b3437555b4edd26cbad389409a
-SHA512 (nmstate-2.1.0-alpha1.tar.gz.asc) = b9930f6baa19faf2e86c7f0659ea461f9c7fe6f1e8f370febe9565838e66e6edaf4e7a3c0fda9cf06ea670e7fd4bb67222be9be9f6796828616a2b8d87d611c9
+SHA512 (nmstate-2.1.0-alpha2.tar.gz) = 36f9622d0e7aa7bfad6909b6f99499afffaf5bae9813b97e1fd24c83d479694fb7d847ec448a69101ee17c12361dc556293387d12634caea05d65fd0edd3c635
+SHA512 (nmstate-2.1.0-alpha2.tar.gz.asc) = 2aa4be0c9ae8f4f0794115bca243244f802da7ceea19f36a99f1112072e16f3b50586ad6ef099c181d2bd475f4abdff624b5376e7670fb54fdddd24065300f90
 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309