diff --git a/spdlog-1.6.1-fmt7_build.patch b/spdlog-1.6.1-fmt7_build.patch
deleted file mode 100644
index 4e80f24..0000000
--- a/spdlog-1.6.1-fmt7_build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 6 Jul 2020 13:01:52 -0400
-Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail.
-
-See: https://github.com/fmtlib/fmt/issues/1538
----
- include/spdlog/details/fmt_helper.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
-index cbc0bdf3..4f363858 100644
---- a/include/spdlog/details/fmt_helper.h
-+++ b/include/spdlog/details/fmt_helper.h
-@@ -34,7 +34,15 @@ template<typename T>
- inline unsigned int count_digits(T n)
- {
-     using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
--    return static_cast<unsigned int>(fmt::internal::count_digits(static_cast<count_type>(n)));
-+    return static_cast<unsigned int>(fmt::
-+// fmt 7.0.0 renamed the internal namespace to detail.
-+// See: https://github.com/fmtlib/fmt/issues/1538
-+#if FMT_VERSION < 70000
-+internal
-+#else
-+detail
-+#endif
-+::count_digits(static_cast<count_type>(n)));
- }
- 
- inline void pad2(int n, memory_buf_t &dest)
diff --git a/spdlog-1.6.1-fmt7_tests.patch b/spdlog-1.6.1-fmt7_tests.patch
deleted file mode 100644
index 602641a..0000000
--- a/spdlog-1.6.1-fmt7_tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 19f280466195f347f3f2c474556a6be0b343a7fb Mon Sep 17 00:00:00 2001
-From: Gabi Melman <gmelman1@gmail.com>
-Date: Wed, 8 Jul 2020 18:50:51 +0300
-Subject: [PATCH] Fix #1611
-
----
- include/spdlog/fmt/bin_to_hex.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
-index e974cf51..5393dcac 100644
---- a/include/spdlog/fmt/bin_to_hex.h
-+++ b/include/spdlog/fmt/bin_to_hex.h
-@@ -92,7 +92,7 @@ struct formatter<spdlog::details::dump_info<T>>
-     auto parse(ParseContext &ctx) -> decltype(ctx.begin())
-     {
-         auto it = ctx.begin();
--        while (*it && *it != '}')
-+        while (it != ctx.end() && *it != '}')
-         {
-             switch (*it)
-             {
diff --git a/spdlog-1.6.1.tar.gz b/spdlog-1.6.1.tar.gz
deleted file mode 100644
index d28a646..0000000
--- a/spdlog-1.6.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:378a040d91f787aec96d269b0c39189f58a6b852e4cbf9150ccfacbe85ebbbfc
-size 285531
diff --git a/spdlog-1.7.0.tar.gz b/spdlog-1.7.0.tar.gz
new file mode 100644
index 0000000..b6a69f4
--- /dev/null
+++ b/spdlog-1.7.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0114a4d3c88be9e696762f37a7c379619443ce9d668546c61b21d41affe5b62
+size 285615
diff --git a/spdlog.changes b/spdlog.changes
index 42b8174..a9a18f7 100644
--- a/spdlog.changes
+++ b/spdlog.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jul  9 19:59:07 UTC 2020 - aloisio@gmx.com
+
+- Update to version 1.7.0
+  * Support fmt version 7.x.
+  * Fixed to_hex segmentation fault
+  * Support for FMT_STRING compile time checking. 
+  * Clean CMakeLists.txt.
+- Drop spdlog-1.6.1-fmt7_build.patch and
+  spdlog-1.6.1-fmt7_tests.patch (merged upstream)
+
 -------------------------------------------------------------------
 Wed Jul  8 11:05:02 UTC 2020 - aloisio@gmx.com
 
diff --git a/spdlog.spec b/spdlog.spec
index 4dbfa51..c986f9c 100644
--- a/spdlog.spec
+++ b/spdlog.spec
@@ -18,16 +18,12 @@
 
 %define _sover  1
 Name:           spdlog
-Version:        1.6.1
+Version:        1.7.0
 Release:        0
 Summary:        C++ logging library
 License:        MIT
 URL:            https://github.com/gabime/spdlog
 Source0:        https://github.com/gabime/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM spdlog-1.6.1-fmt7_build.patch
-Patch0:         spdlog-1.6.1-fmt7_build.patch
-# PATCH-FIX-UPSTREAM spdlog-1.6.1-fmt7_tests.patch
-Patch1:         spdlog-1.6.1-fmt7_tests.patch
 BuildRequires:  benchmark-devel >= 1.4.0
 BuildRequires:  cmake
 BuildRequires:  gcc