From 45e77bc97abec12ea7bbe10aaae4ac2704351fa3 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 3 Jun 2018 15:43:33 +0200 Subject: [PATCH] Updated to version 0.4.3. --- .gitignore | 2 ++ nheko-drop-flags.patch | 2 +- nheko-drop-rpath.patch | 4 ++-- nheko.spec | 13 ++++++++----- sources | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 09dcf24..2dabbac 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /matrix-structs-5e57c23.tar.gz /nheko-0.4.1.tar.gz /nheko-0.4.2.tar.gz +/matrix-structs-eeb7373.tar.gz +/nheko-0.4.3.tar.gz diff --git a/nheko-drop-flags.patch b/nheko-drop-flags.patch index 029eaf1..8253a1e 100644 --- a/nheko-drop-flags.patch +++ b/nheko-drop-flags.patch @@ -1,4 +1,4 @@ -From f9d3f0c222d6c7968479394dfbd6eb8dbc49092c Mon Sep 17 00:00:00 2001 +From 0328a5760d98aeb854b42cdad4f9bb1d492fb171 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 12 Dec 2017 15:25:45 +0100 Subject: [PATCH 1/2] Completely remove additional CXXFLAGS. diff --git a/nheko-drop-rpath.patch b/nheko-drop-rpath.patch index 8825641..4a31280 100644 --- a/nheko-drop-rpath.patch +++ b/nheko-drop-rpath.patch @@ -1,4 +1,4 @@ -From cd984bdf366f67bb65dadf89a0eb4c7843146442 Mon Sep 17 00:00:00 2001 +From 73575d75621855e910564cece5166d71ef02d559 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 16 Dec 2017 18:20:43 +0100 Subject: [PATCH 2/2] Remove rpath. @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] Remove rpath. 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e685996..58f5733 100644 +index fffe0f7..93c1843 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -361,3 +361,4 @@ if(UNIX AND NOT APPLE) diff --git a/nheko.spec b/nheko.spec index fc57c89..33e7af0 100644 --- a/nheko.spec +++ b/nheko.spec @@ -3,7 +3,7 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # Git revision of matrix-structs... -%global commit2 5e57c2385a79b6629d1998fec4a7c0baee23555e +%global commit2 eeb7373729a1618e2b3838407863342b88b8a0de %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) # Git revision of tweeny... @@ -20,7 +20,7 @@ Summary: Desktop client for the Matrix protocol Name: nheko -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -77,7 +77,7 @@ for Matrix that feels more like a mainstream chat app. %prep # Unpacking main tarball with sources... -%autosetup -p1 +%autosetup -n %{name}-%{commit0} -p1 mkdir {%{_target_platform},.third-party} sed -i '/GIT_/d' cmake/*.cmake @@ -90,8 +90,8 @@ pushd ".third-party" tar -xf %{SOURCE3} mv tweeny-%{commit3} tweeny pushd matrix_structs - sed -i 's@add_library(${LIBRARY_NAME} ${SRC})@add_library(${LIBRARY_NAME} STATIC ${SRC})@g' CMakeLists.txt - sed -i '/-Werror/d' cmake/CompilerFlags.cmake + sed -i 's@add_library(matrix_structs ${SRC})@add_library(matrix_structs STATIC ${SRC})@g' CMakeLists.txt + sed -i '/-Werror/d' CMakeLists.txt tar -xf %{SOURCE4} popd popd @@ -131,6 +131,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Sun Jun 03 2018 Vitaly Zaitsev - 0.4.3-1 +- Updated to version 0.4.3. + * Fri May 25 2018 Vitaly Zaitsev - 0.4.2-1 - Updated to version 0.4.2. diff --git a/sources b/sources index a19f5ff..aa29a64 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (header_only-f3b7019.tar.gz) = 8dd8a43c9cdb34992f95dd1efa6135759fbb6d0882388a25f2753855fa45b5bbc18ba2f295b5eb3c9bc08c76583a2532ead473191d9951de6d077863ff2d2909 SHA512 (lmdbxx-0b43ca8.tar.gz) = 025a945288a398b09549c91c98509a57912f8614c14b476e7c8d4fb0dc8fc1288fa1b3a33567cccea474277a1c48b3701f2df31e8a6acc851eb9549a9822f074 -SHA512 (matrix-structs-5e57c23.tar.gz) = dd622cd92e311e36c347dad134f11ebc8f5aa172debc8d6a5095324039e018b4c251a8450d01991746afb6566c6520c2de0f4fa64721ecb130caaab954c9120c -SHA512 (nheko-0.4.2.tar.gz) = 362c5c529eb8ed09595d6955a2367a87da02fc02ffae7b41300b5a2697946022673381e74a795f534843000f3d2c148eeaaead3779830128bbb12ec8fcc0264d +SHA512 (matrix-structs-eeb7373.tar.gz) = ab077a5c183992ff6d659b5f0d9113ae34f1ec1eb8ee42090c2322f49b82e85d71108c7ed48c3ec987fc183854414f220dfa1956ff00842d92be2c9592f4f144 +SHA512 (nheko-0.4.3.tar.gz) = b9ad4131b75af7ee3b79cb89d63313e94f76a6a6672c5c02b264ebec75a2a2525de266d6e4d07482736b714188a5a1eba721802ff951ee4d77f8cbf571758777 SHA512 (tweeny-b94ce07.tar.gz) = 365d51311e8738f16c8b17e29fa950a1f62622c9f844d847675e36536267091fb554d8a87f89fb1a659defe7ebe30109b7630cc44753079039028d355b60f9db