From cc29d9f5b17dc269609a63bab33eadcfe5bc725b Mon Sep 17 00:00:00 2001
From: Vasiliy Glazov <vascom2@gmail.com>
Date: Apr 26 2021 15:30:00 +0000
Subject: Update to 1.7.0.


---

diff --git a/.gitignore b/.gitignore
index 6695fd9..7158227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /84f63d25bd77d61f8feccf08dd24d0d11895ef32
 /stlink-1.6.0.tar.gz
 /stlink-1.6.1.tar.gz
+/stlink-1.7.0.tar.gz
diff --git a/sources b/sources
index af4bb60..4e75079 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stlink-1.6.1.tar.gz) = ac7ca0c23cd82a66be3ade4fec2a3fe757e5fc2e1d5c68a81316781a59568261a363efb58f5c529921b1c97185489fca5f1c1c4681098c72fb121b0858916fbc
+SHA512 (stlink-1.7.0.tar.gz) = 58b73c7a73809f36ab8ef53370bcbdba7456433c8559f350349febd282188541184b5c171eb2ca1ad38ec4b3ae32d3a89895a208bcacc264ec0aed5f61e6bcd0
diff --git a/stlink-gcc11.patch b/stlink-gcc11.patch
deleted file mode 100644
index 3e0deff..0000000
--- a/stlink-gcc11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/st-util/gdb-server.c b/src/st-util/gdb-server.c
-index c47a3a9f..4177cef1 100644
---- a/src/st-util/gdb-server.c
-+++ b/src/st-util/gdb-server.c
-@@ -43,7 +43,7 @@
- static stlink_t *connected_stlink = NULL;
- static bool semihosting = false;
- static bool serial_specified = false;
--static char serialnumber[28] = {0};
-+static char serialnumber[STLINK_SERIAL_MAX_SIZE] = {0};
- 
- #if defined(_WIN32)
- #define close_socket win32_close_socket
diff --git a/stlink.spec b/stlink.spec
index ad4c297..5d1be46 100644
--- a/stlink.spec
+++ b/stlink.spec
@@ -3,16 +3,15 @@
 # %global date 20200420
 
 Name:           stlink
-Version:        1.6.1
+Version:        1.7.0
 # Release:        0.1.%{date}git%{gitcommit}%{?dist}
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        STM32 discovery line Linux programmer
 License:        BSD
 
 Url:            https://github.com/stlink-org/stlink
 # Source0:        %{url}/tarball/%{gitcommit_full}
 Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         stlink-gcc11.patch
 
 BuildRequires:  gcc
 BuildRequires:  cmake3
@@ -78,17 +77,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop
 
 %files gui
 %{_bindir}/%{name}-gui
-%{_bindir}/%{name}-gui.ui
+%{_datadir}/%{name}-gui.ui
 %{_datadir}/applications/%{name}-gui.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}-gui.svg
 
 %files devel
 %{_includedir}/%{name}*
-%{_includedir}/stm32.h
+# %{_includedir}/stm32.h
 %{_libdir}/lib%{name}.so
-%{_libdir}/pkgconfig/%{name}.pc
+# %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Apr 26 2021 Vasiliy N. Glazov <vascom2@gmail.com> - 1.7.0-1
+- Update to 1.7.0
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
@@ -102,7 +104,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Mon Jun 01 2020 Vasiliy N. Glazov <vascom2@gmail.com> - 1.6.0-1
+* Mon Jun 01 2020 Vasiliy N. Glazov <vascom2@gmail.com> - 1.6.1-1
 - Update to 1.6.1
 
 * Mon Apr 20 2020 Vasiliy N. Glazov <vascom2@gmail.com> - 1.6.1-0.1.20200420gita7568d3