diff --git a/.gitignore b/.gitignore index 25d4d3c..62f069f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /1.0.tar.gz /nvml-1.1.tar.gz /nvml-1.2.tar.gz +/nvml-1.2.1.tar.gz diff --git a/1.2-0001-jemalloc-fix-test-compilation-on-Fedora-rawhide.patch b/1.2-0001-jemalloc-fix-test-compilation-on-Fedora-rawhide.patch deleted file mode 100644 index 0b96d56..0000000 --- a/1.2-0001-jemalloc-fix-test-compilation-on-Fedora-rawhide.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0fbb5100e1d17e2af3e7bb1ec84ce9b893262c1e Mon Sep 17 00:00:00 2001 -From: Krzysztof Czurylo -Date: Sat, 18 Feb 2017 17:17:12 +0100 -Subject: [PATCH] jemalloc: fix test compilation on Fedora rawhide - -Fixes compilation error in jemalloc tests when using gcc 7.0.x. ---- - src/jemalloc/test/unit/pool.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jemalloc/test/unit/pool.h b/src/jemalloc/test/unit/pool.h -index eab79753..c584a10a 100644 ---- a/src/jemalloc/test/unit/pool.h -+++ b/src/jemalloc/test/unit/pool.h -@@ -224,7 +224,7 @@ TEST_BEGIN(test_pool_check_memory) { - pool = pool_create(mem_pool, pool_size, 0); - assert_ptr_not_null(pool, "Can not create pool!!!"); - size_allocated = 0; -- memset(allocs, 0, TEST_ALLOCS_SIZE); -+ memset(allocs, 0, TEST_ALLOCS_SIZE * sizeof(void *)); - - for (i = 0; i < TEST_ALLOCS_SIZE;++i) { - allocs[i] = pool_malloc(pool, object_size); --- -2.11.1 - diff --git a/1.2-0002-test-fix-cpp-test-compilation-on-Fedora-rawhide.patch b/1.2-0002-test-fix-cpp-test-compilation-on-Fedora-rawhide.patch deleted file mode 100644 index 6d88bd8..0000000 --- a/1.2-0002-test-fix-cpp-test-compilation-on-Fedora-rawhide.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 08b82f2dd0ba9333fd62df8aae7de32aa3a70507 Mon Sep 17 00:00:00 2001 -From: Krzysztof Czurylo -Date: Sat, 18 Feb 2017 17:19:21 +0100 -Subject: [PATCH] test: fix cpp test compilation on Fedora rawhide - -Adds missing include in obj_cpp_cond_var test. ---- - src/test/obj_cpp_cond_var/obj_cpp_cond_var.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/test/obj_cpp_cond_var/obj_cpp_cond_var.cpp b/src/test/obj_cpp_cond_var/obj_cpp_cond_var.cpp -index 44ef676c..2bfb7c19 100644 ---- a/src/test/obj_cpp_cond_var/obj_cpp_cond_var.cpp -+++ b/src/test/obj_cpp_cond_var/obj_cpp_cond_var.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright 2016, Intel Corporation -+ * Copyright 2016-2017, Intel Corporation - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -40,6 +40,7 @@ - #include - #include - -+#include - #include - #include - #include --- -2.11.1 - diff --git a/nvml-1.2-3.fc26.src.rpm b/nvml-1.2-3.fc26.src.rpm deleted file mode 100644 index 90c7775..0000000 Binary files a/nvml-1.2-3.fc26.src.rpm and /dev/null differ diff --git a/nvml.spec b/nvml.spec index 565046a..afdf1be 100644 --- a/nvml.spec +++ b/nvml.spec @@ -1,13 +1,11 @@ Name: nvml -Version: 1.2 -Release: 3%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Non-Volatile Memory Library License: BSD URL: http://pmem.io/nvml Source0: https://github.com/pmem/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: 1.2-0001-jemalloc-fix-test-compilation-on-Fedora-rawhide.patch -Patch1: 1.2-0002-test-fix-cpp-test-compilation-on-Fedora-rawhide.patch BuildRequires: glibc-devel BuildRequires: autoconf @@ -529,8 +527,6 @@ Useful applications for administration and diagnosis of persistent memory. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 %build # Currently, NVML makefiles do not allow to easily override CFLAGS, @@ -585,8 +581,11 @@ make check %changelog +* Thu Mar 16 2017 Krzysztof Czurylo - 1.2.1-1 +- Update to NVML version 1.2.1 (RHBZ #1425038) + * Tue Feb 21 2017 Krzysztof Czurylo - 1.2-3 -- Fix compilation under gcc 7.0.x (RHBZ #14240004) +- Fix compilation under gcc 7.0.x (RHBZ #1424004) * Sat Feb 11 2017 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 6fd5c09..6761dd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nvml-1.2.tar.gz) = 6d98dc80448ab23fc05d3db02f434a5e1f24142e2780bebaaffb38798b327be1df374b542048cf31f8a079c4364c49e935fa806162cd5b1c457b784cda8115f6 +SHA512 (nvml-1.2.1.tar.gz) = b9665fe1c7b8d063d254eeab5b03e335e6ef60e14067b4bc4afa74f880b14b55e517486ac2149f7ae99169c96bfe1ed65c057fab3ac1627949add622a5d61173