From 5a73ef49b20ae19c8e8ac0dcbd3cae3bc89e2507 Mon Sep 17 00:00:00 2001 From: Vasiliy Glazov Date: Feb 20 2020 07:18:42 +0000 Subject: Update to 1.6.0. --- diff --git a/.gitignore b/.gitignore index 1e115cd..d866896 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /1165cf712713af48c61c4782ad5c9477c4574708 /d040db5585d33dc36bd8ae093c024583ef1b4f74 /84f63d25bd77d61f8feccf08dd24d0d11895ef32 +/stlink-1.6.0.tar.gz diff --git a/sources b/sources index 839ea04..ba96f2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (84f63d25bd77d61f8feccf08dd24d0d11895ef32) = 9b3e2664ed157e9c98ca4b673a88674ac94e28989749642ed4209d2a78d8fdda43754a0b3994d086c87f60ce43668dc349e8ea437dd5cf356afb17bb4c6f6135 +SHA512 (stlink-1.6.0.tar.gz) = 0bf2416dac69e490560063714d630c4f549568bd9047113fb334f0841f5db23b97876307be8f0b1731863a2438c9502b9916d0d652c516d50969cb8b2cfa1a15 diff --git a/stlink.spec b/stlink.spec index 751babf..ee69a64 100644 --- a/stlink.spec +++ b/stlink.spec @@ -1,18 +1,20 @@ -%global gitcommit_full 84f63d25bd77d61f8feccf08dd24d0d11895ef32 -%global gitcommit %(c=%{gitcommit_full}; echo ${c:0:7}) -%global date 20190606 +# %global gitcommit_full 84f63d25bd77d61f8feccf08dd24d0d11895ef32 +# %global gitcommit %(c=%{gitcommit_full}; echo ${c:0:7}) +# %global date 20190606 %global optflags %{optflags} -flto %global build_ldflags %{build_ldflags} -flto Name: stlink -Version: 1.5.1 -Release: 0.5.%{date}git%{gitcommit}%{?dist} +Version: 1.6.0 +# Release: 0.5.%{date}git%{gitcommit}%{?dist} +Release: 1%{?dist} Summary: STM32 discovery line Linux programmer License: BSD Url: https://github.com/texane/stlink -Source0: https://github.com/texane/stlink/tarball/%{gitcommit_full} +# Source0: https://github.com/texane/stlink/tarball/%{gitcommit_full} +Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: cmake3 @@ -41,7 +43,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Include files and mandatory libraries for development. %prep -%autosetup -n texane-%{name}-%{gitcommit} +%autosetup +# -n texane-%{name}-%{gitcommit} %build @@ -65,8 +68,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop %files -%doc README.md ChangeLog.md -%license LICENSE +%doc README.md CHANGELOG.md +%license LICENSE.md %config(noreplace) %{_sysconfdir}/modprobe.d/%{name}* %{_bindir}/st-* %{_libdir}/lib%{name}.so.* @@ -85,6 +88,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop %{_libdir}/pkgconfig/*.pc %changelog +* Thu Feb 20 2020 Vasiliy N. Glazov - 1.6.0-1 +- Update to 1.6.0 + * Fri Jan 31 2020 Fedora Release Engineering - 1.5.1-0.5.20190606git84f63d2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild