diff --git a/.gitignore b/.gitignore index 27ea9d3..bd6f8e6 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /libstoragemgmt-1.8.3.tar.gz /libstoragemgmt-1.8.4.tar.gz /libstoragemgmt-1.8.5.tar.gz +/libstoragemgmt-1.8.6.tar.gz diff --git a/0002-test-build.patch b/0002-test-build.patch deleted file mode 100644 index 7a26b2d..0000000 --- a/0002-test-build.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/test/tester.c b/test/tester.c -index ebef5d8..a86201d 100644 ---- a/test/tester.c -+++ b/test/tester.c -@@ -21,6 +21,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -903,7 +904,8 @@ START_TEST(test_fs) { - ck_assert_msg(NULL != nfs, "nfs = %p", nfs); - - fs_free_space = lsm_fs_free_space_get(nfs); -- ck_assert_msg(fs_free_space != 0, "fs_free_space = %lu", fs_free_space); -+ ck_assert_msg(fs_free_space != 0, "fs_free_space = %" PRIu64, -+ fs_free_space); - - lsm_fs *cloned_fs = NULL; - rc = lsm_fs_clone(c, nfs, "cloned_fs", NULL, &cloned_fs, &job, -@@ -1143,11 +1145,11 @@ START_TEST(test_disks) { - - ck_assert_msg(lsm_disk_type_get(d[i]) >= 1, "%d", - (int)lsm_disk_type_get(d[i])); -- ck_assert_msg(lsm_disk_number_of_blocks_get(d[i]) >= 1, "%lu", -+ ck_assert_msg(lsm_disk_number_of_blocks_get(d[i]) >= 1, "%" PRIu64, - lsm_disk_number_of_blocks_get(d[i])); -- ck_assert_msg(lsm_disk_block_size_get(d[i]) >= 1, "%lu", -+ ck_assert_msg(lsm_disk_block_size_get(d[i]) >= 1, "%" PRIu64, - lsm_disk_block_size_get(d[i])); -- ck_assert_msg(lsm_disk_status_get(d[i]) >= 1, "%lu", -+ ck_assert_msg(lsm_disk_status_get(d[i]) >= 1, "%" PRIu64, - lsm_disk_status_get(d[i])); - ck_assert_msg(lsm_disk_vpd83_get(d[i]) != NULL, "NULL"); - } -@@ -2236,7 +2238,7 @@ START_TEST(test_get_available_plugins) { - num = lsm_string_list_size(plugins); - for (i = 0; i < num; i++) { - const char *info = lsm_string_list_elem_get(plugins, i); -- ck_assert_msg(strlen(info) > 0, "%lu", strlen(info)); -+ ck_assert_msg(strlen(info) > 0, "%zd", strlen(info)); - printf("%s\n", info); - } - -@@ -2406,9 +2408,9 @@ START_TEST(test_nfs_export_funcs) { - ASSERT_STR_MATCH(lsm_nfs_export_auth_type_get(copy), auth); - ASSERT_STR_MATCH(lsm_nfs_export_options_get(copy), options); - -- ck_assert_msg(lsm_nfs_export_anon_uid_get(copy) == anonuid, "%lu", -+ ck_assert_msg(lsm_nfs_export_anon_uid_get(copy) == anonuid, "%" PRIu64, - lsm_nfs_export_anon_uid_get(copy)); -- ck_assert_msg(lsm_nfs_export_anon_gid_get(copy) == anongid, "%lu", -+ ck_assert_msg(lsm_nfs_export_anon_gid_get(copy) == anongid, "%" PRIu64, - lsm_nfs_export_anon_gid_get(copy)); - - ck_assert_msg(compare_string_lists(lsm_nfs_export_root_get(export), -@@ -2450,9 +2452,9 @@ START_TEST(test_nfs_export_funcs) { - anongid = anongid + 400; - G(rc, lsm_nfs_export_anon_gid_set, export, anongid); - -- ck_assert_msg(lsm_nfs_export_anon_uid_get(export) == anonuid, "%lu", -+ ck_assert_msg(lsm_nfs_export_anon_uid_get(export) == anonuid, "%" PRIu64, - lsm_nfs_export_anon_uid_get(export)); -- ck_assert_msg(lsm_nfs_export_anon_gid_get(export) == anongid, "%lu", -+ ck_assert_msg(lsm_nfs_export_anon_gid_get(export) == anongid, "%" PRIu64, - lsm_nfs_export_anon_gid_get(export)); - - generate_random(rstring, sizeof(rstring)); -@@ -3126,7 +3128,7 @@ START_TEST(test_pool_member_info) { - for (y = 0; y < lsm_string_list_size(member_ids); y++) { - // Simulator user reading the member id. - const char *cur_member_id = lsm_string_list_elem_get(member_ids, y); -- ck_assert_msg(strlen(cur_member_id), "%ld", strlen(cur_member_id)); -+ ck_assert_msg(strlen(cur_member_id), "%zd", strlen(cur_member_id)); - } - lsm_string_list_free(member_ids); - } -@@ -3676,7 +3678,7 @@ START_TEST(test_batteries) { - "Incorrect battery system id: %s", id); - ck_assert_msg(lsm_battery_type_get(bs[i]) >= 1, "%u", - lsm_battery_type_get(bs[i])); -- ck_assert_msg(lsm_battery_status_get(bs[i]) >= 1, "%lu", -+ ck_assert_msg(lsm_battery_status_get(bs[i]) >= 1, "%" PRIu64, - lsm_battery_status_get(bs[i])); - } - lsm_battery_record_array_free(bs, count); diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec index 8931807..ce30d3b 100644 --- a/libstoragemgmt.spec +++ b/libstoragemgmt.spec @@ -8,14 +8,13 @@ %endif Name: libstoragemgmt -Version: 1.8.5 -Release: 3%{?dist} +Version: 1.8.6 +Release: 1%{?dist} Summary: Storage array management library License: LGPLv2+ URL: https://github.com/libstorage/libstoragemgmt Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz Patch1: 0001-change-run-dir.patch -Patch2: 0002-test-build.patch Requires: python3-%{name} BuildRequires: gcc gcc-c++ BuildRequires: autoconf automake libtool libxml2-devel check-devel perl-interpreter @@ -623,6 +622,9 @@ fi %{_mandir}/man1/local_lsmplugin.1* %changelog +* Mon Nov 2 2020 Tony Asleson - 1.8.6-1 +- Upgrade to 1.8.6 + * Thu Oct 1 2020 Tony Asleson - 1.8.5-3 - Remove pywbem version check as its not needed and breaks now that epoch is used in it. diff --git a/sources b/sources index 3a1cf12..97e54b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libstoragemgmt-1.8.5.tar.gz) = cfbe500dd2217ff77734f2ccdd0a85e2c69b449c82154a854f1673cbffb073116327d9fbad0dc93989148de8be579459a1bc1f4fe6a157f5a2e8949961bce45e +SHA512 (libstoragemgmt-1.8.6.tar.gz) = 4ec44c9b87b4afd7e255ad1720b2c979a6257b76034694211cbd59f5d2a95bf37bdeea168a39292c0c20ac9b5839f39b6f8c7202676be61427b49347a26a4bca