diff --git a/.gitignore b/.gitignore index c9cf552..f255283 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /ae717b945dea2ca46c2e3ed0c97cb4bfc4fa7252 /7651d2116fd74c7803ea00ab1da7cf3d00faf44c /1165cf712713af48c61c4782ad5c9477c4574708 +/d040db5585d33dc36bd8ae093c024583ef1b4f74 diff --git a/sources b/sources index d872489..7eac43c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (1165cf712713af48c61c4782ad5c9477c4574708) = bd29ac60be72865e4c3cc3d4cb59ecd9f3930ab7d89d25c966169edc4a2a40e3643b1f9a2664f667e07d9259547c34965eecc4683acb953809502f2a7167a0e8 +SHA512 (d040db5585d33dc36bd8ae093c024583ef1b4f74) = 6ff917891901f46981b009d9f7df990e1bfd354aec8e77baa939dcdafb2a849019e8103b607b7cab665ec906445b97a4e0bd2857b5646831e5a8f01875916990 diff --git a/stlink.spec b/stlink.spec index 0b90b68..155e547 100644 --- a/stlink.spec +++ b/stlink.spec @@ -1,6 +1,9 @@ -%global gitcommit_full 1165cf712713af48c61c4782ad5c9477c4574708 +%global gitcommit_full d040db5585d33dc36bd8ae093c024583ef1b4f74 %global gitcommit %(c=%{gitcommit_full}; echo ${c:0:7}) -%global date 20190216 +%global date 20190513 + +%global optflags %{optflags} -flto +%global build_ldflags %{build_ldflags} -flto Name: stlink Version: 1.5.1 @@ -12,7 +15,7 @@ Url: https://github.com/texane/stlink Source0: https://github.com/texane/stlink/tarball/%{gitcommit_full} BuildRequires: gcc -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(libusb-1.0) @@ -43,7 +46,13 @@ Include files and mandatory libraries for development. %build mkdir build pushd build - %cmake .. -DSTLINK_UDEV_RULES_DIR="%{_udevrulesdir}" -DSTLINK_STATIC_LIB=OFF + %cmake3 \ + -DCMAKE_AR=/usr/bin/gcc-ar \ + -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \ + -DCMAKE_NM=/usr/bin/gcc-nm \ + -DSTLINK_UDEV_RULES_DIR="%{_udevrulesdir}" \ + -DSTLINK_STATIC_LIB=OFF \ + .. %make_build popd @@ -75,6 +84,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop %{_libdir}/pkgconfig/*.pc %changelog +* Mon May 20 2019 Vasiliy N. Glazov - 1.5.1-0.3.20190513gitd040db5 +- Update to latest git + * Tue Feb 19 2019 Kalev Lember - 1.5.1-0.3.20190216git1165cf7 - Rebuilt against fixed atk (#1626575)