From e86329e70ed58b309811e02258949ae136280e75 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 3 Feb 2021 15:36:07 +0000 Subject: [PATCH 01/22] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..f76c3ba --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# libdispatch + +The libdispatch package From 06ac5663bbc62ae089d10f36a7f90021420c8e1f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 3 Feb 2021 10:59:14 -0600 Subject: [PATCH 02/22] Initial version of libdispatch --- .gitignore | 1 + asprintf.patch | 104 +++++++++++++++++++++++++++++++++++++++++++++++ libdispatch.spec | 90 ++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 196 insertions(+) create mode 100644 .gitignore create mode 100644 asprintf.patch create mode 100644 libdispatch.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b171319 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/corelibs-libdispatch.tar.gz diff --git a/asprintf.patch b/asprintf.patch new file mode 100644 index 0000000..6573607 --- /dev/null +++ b/asprintf.patch @@ -0,0 +1,104 @@ +diff -Naur ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/bsdtests.c ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/bsdtests.c +--- ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/bsdtests.c 2020-09-02 02:28:48.000000000 -0500 ++++ ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/bsdtests.c 2021-01-19 11:17:43.952112327 -0600 +@@ -347,8 +347,8 @@ + { + char* actual_str; + char* expected_str; +- asprintf(&actual_str, "%d\t%s", actual, actual ? strerror(actual) : ""); +- asprintf(&expected_str, "%d\t%s", expected, expected ? strerror(expected) : ""); ++ (void)asprintf(&actual_str, "%d\t%s", actual, actual ? strerror(actual) : ""); ++ (void)asprintf(&expected_str, "%d\t%s", expected, expected ? strerror(expected) : ""); + _test_print(file, line, desc, + (actual == expected), "%s", actual_str, "%s", expected_str); + free(actual_str); +@@ -369,8 +369,8 @@ + { + char* actual_str; + char* expected_str; +- asprintf(&actual_str, "%d %s", actual, actual ? mach_error_string(actual) : ""); +- asprintf(&expected_str, "%d %s", expected, expected ? mach_error_string(expected) : ""); ++ (void)asprintf(&actual_str, "%d %s", actual, actual ? mach_error_string(actual) : ""); ++ (void)asprintf(&expected_str, "%d %s", expected, expected ? mach_error_string(expected) : ""); + _test_print(file, line, desc, + (actual == expected), "%s", actual_str, "%s", expected_str); + free(actual_str); +@@ -416,12 +416,12 @@ + if (code != expectedCode) { + char buffer[BUFSIZ]; + CFStringGetCString(errDesc, buffer, sizeof(buffer), kCFStringEncodingUTF8); +- asprintf(&actual_str, "%ld\t%s", code, buffer); ++ (void)asprintf(&actual_str, "%ld\t%s", code, buffer); + } else { +- asprintf(&actual_str, "%ld", code); ++ (void)asprintf(&actual_str, "%ld", code); + } + +- asprintf(&expected_str, "%ld", expectedCode); ++ (void)asprintf(&expected_str, "%ld", expectedCode); + _test_print("", (long) 0, desc, + (code == expectedCode), "%s", actual_str, "%s", expected_str); + +diff -Naur ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_io.c ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_io.c +--- ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_io.c 2020-09-02 02:28:48.000000000 -0500 ++++ ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_io.c 2021-01-19 11:19:09.286850562 -0600 +@@ -255,7 +255,7 @@ + test_stop(); + } + char *path_out = NULL; +- asprintf(&path_out, "%s\\dispatchtest_io.XXXXXX", temp_dir); ++ (void)asprintf(&path_out, "%s\\dispatchtest_io.XXXXXX", temp_dir); + #else + char path_out[] = "/tmp/dispatchtest_io.XXXXXX"; + #endif +@@ -486,7 +486,7 @@ + #if defined(_WIN32) + for (size_t i = 0; paths[i]; i++) { + char *search_path = NULL; +- asprintf(&search_path, "%s\\*", paths[i]); ++ (void)asprintf(&search_path, "%s\\*", paths[i]); + WIN32_FIND_DATAA node; + HANDLE find = FindFirstFileA(search_path, &node); + free(search_path); +@@ -503,7 +503,7 @@ + continue; + } + char *node_path = NULL; +- asprintf(&node_path, "%s\\%s", paths[i], node.cFileName); ++ (void)asprintf(&node_path, "%s\\%s", paths[i], node.cFileName); + if (node.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + char *subdir_paths[] = {node_path, NULL}; + test_enumerate_dir_trees(subdir_paths, process_file); +@@ -590,7 +590,7 @@ + test_ptr_notnull("SystemRoot", system_root); + test_stop(); + } +- asprintf(&paths[0], "%s\\System32", system_root); ++ (void)asprintf(&paths[0], "%s\\System32", system_root); + #else + char *paths[] = {"/usr/lib", NULL}; + #endif +diff -Naur ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_io_muxed.c ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_io_muxed.c +--- ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_io_muxed.c 2020-09-02 02:28:48.000000000 -0500 ++++ ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_io_muxed.c 2021-01-19 11:18:19.122416587 -0600 +@@ -64,7 +64,7 @@ + const char *path_separator = "/"; + #endif + char *path = NULL; +- asprintf(&path, "%s%sdispatchtest_io.XXXXXX", temp_dir, path_separator); ++ (void)asprintf(&path, "%s%sdispatchtest_io.XXXXXX", temp_dir, path_separator); + dispatch_fd_t fd = mkstemp(path); + if (fd == -1) { + test_errno("mkstemp", errno, 0); +diff -Naur ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_overcommit.c ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_overcommit.c +--- ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_overcommit.c 2020-09-02 02:28:48.000000000 -0500 ++++ ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_overcommit.c 2021-01-19 11:16:37.385536454 -0600 +@@ -48,7 +48,7 @@ + int i; + for (i = 0; i < final; ++i) { + char* name; +- asprintf(&name, "test.overcommit.%d", i); ++ (void)asprintf(&name, "test.overcommit.%d", i); + + dispatch_queue_t queue = dispatch_queue_create(name, NULL); + test_ptr_notnull("dispatch_queue_create", queue); diff --git a/libdispatch.spec b/libdispatch.spec new file mode 100644 index 0000000..b58e823 --- /dev/null +++ b/libdispatch.spec @@ -0,0 +1,90 @@ +%global toolchain clang +%global reltag 5.3.3-RELEASE + + +Name: libdispatch +Version: 5.3.3 +Release: 1%{?dist} +Summary: Apple's Grand Central Dispatch library +License: ASL 2.0 +URL: https://github.com/apple/swift-corelibs-libdispatch + +Source0: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{reltag}.tar.gz#/corelibs-libdispatch.tar.gz + +Patch0: asprintf.patch + +BuildRequires: clang +BuildRequires: libbsd-devel +BuildRequires: ninja-build +BuildRequires: cmake +BuildRequires: chrpath + +ExclusiveArch: x86_64 aarch64 + +Provides: libblocksruntime = %{version}-%{release} +Obsoletes: libblocksruntime < 7.0.0-5 + +Epoch: 1 + +%description +Grand Central Dispatch (GCD or libdispatch) provides +comprehensive support for concurrent code execution on +multicore hardware. + +libdispatch is currently available on all Darwin platforms. +This project aims to make a modern version of libdispatch +available on all other Swift platforms. To do this, we will +implement as much of the portable subset of the API as +possible, using the existing open source C implementation. + +libdispatch on Darwin is a combination of logic in the xnu +kernel alongside the user-space Library. The kernel has the +most information available to balance workload across the +entire system. As a first step, however, we believe it is +useful to bring up the basic functionality of the library +using user-space pthread primitives on Linux. Eventually, a +Linux kernel module could be developed to support more +informed thread scheduling. + + +%package devel +Summary: Development files for libdispatch +Requires: %{name}%{?_isa} = %{version}-%{release} + + +%description devel +Development files for libdispatch + + +%prep +%setup -q -n swift-corelibs-libdispatch-swift-%{reltag} + +%patch0 -p2 + + +%build +%cmake -G Ninja . +%cmake_build + + +%install +%cmake_install +chrpath --delete %{buildroot}%{_libdir}/libdispatch.so + + +%files +%license LICENSE +%{_libdir}/libBlocksRuntime.so +%{_libdir}/libdispatch.so +%{_mandir}/man3/* + + +%files devel +%{_includedir}/Block.h +%{_includedir}/dispatch/* +%{_includedir}/os/* + + +%changelog +* Wed Feb 03 2021 Ron Olson 5.3.3-1 +- Initial version based on version 5.3.3-RELEASE diff --git a/sources b/sources new file mode 100644 index 0000000..f362882 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (corelibs-libdispatch.tar.gz) = b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909 From 832afae13da40c0659748527da139922aa185bef Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 8 Feb 2021 13:31:06 -0600 Subject: [PATCH 03/22] Fixed issue with -devel package not finding the parent --- libdispatch.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libdispatch.spec b/libdispatch.spec index b58e823..f5ea23b 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -4,7 +4,7 @@ Name: libdispatch Version: 5.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -49,7 +49,7 @@ informed thread scheduling. %package devel Summary: Development files for libdispatch -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel @@ -86,5 +86,7 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Mon Feb 08 2021 Ron Olson 5.3.3-2 +- Fixed issue with devel package not finding parent * Wed Feb 03 2021 Ron Olson 5.3.3-1 - Initial version based on version 5.3.3-RELEASE From 05e3c1e40572dbc06aa3c46f12bdfef9f73c2b44 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 3 Jun 2021 10:12:46 -0500 Subject: [PATCH 04/22] Updated to libDispatch-5.4.1 --- asprintf.patch | 104 ----------------------------------------------- libdispatch.spec | 27 ++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 120 deletions(-) delete mode 100644 asprintf.patch diff --git a/asprintf.patch b/asprintf.patch deleted file mode 100644 index 6573607..0000000 --- a/asprintf.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -Naur ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/bsdtests.c ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/bsdtests.c ---- ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/bsdtests.c 2020-09-02 02:28:48.000000000 -0500 -+++ ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/bsdtests.c 2021-01-19 11:17:43.952112327 -0600 -@@ -347,8 +347,8 @@ - { - char* actual_str; - char* expected_str; -- asprintf(&actual_str, "%d\t%s", actual, actual ? strerror(actual) : ""); -- asprintf(&expected_str, "%d\t%s", expected, expected ? strerror(expected) : ""); -+ (void)asprintf(&actual_str, "%d\t%s", actual, actual ? strerror(actual) : ""); -+ (void)asprintf(&expected_str, "%d\t%s", expected, expected ? strerror(expected) : ""); - _test_print(file, line, desc, - (actual == expected), "%s", actual_str, "%s", expected_str); - free(actual_str); -@@ -369,8 +369,8 @@ - { - char* actual_str; - char* expected_str; -- asprintf(&actual_str, "%d %s", actual, actual ? mach_error_string(actual) : ""); -- asprintf(&expected_str, "%d %s", expected, expected ? mach_error_string(expected) : ""); -+ (void)asprintf(&actual_str, "%d %s", actual, actual ? mach_error_string(actual) : ""); -+ (void)asprintf(&expected_str, "%d %s", expected, expected ? mach_error_string(expected) : ""); - _test_print(file, line, desc, - (actual == expected), "%s", actual_str, "%s", expected_str); - free(actual_str); -@@ -416,12 +416,12 @@ - if (code != expectedCode) { - char buffer[BUFSIZ]; - CFStringGetCString(errDesc, buffer, sizeof(buffer), kCFStringEncodingUTF8); -- asprintf(&actual_str, "%ld\t%s", code, buffer); -+ (void)asprintf(&actual_str, "%ld\t%s", code, buffer); - } else { -- asprintf(&actual_str, "%ld", code); -+ (void)asprintf(&actual_str, "%ld", code); - } - -- asprintf(&expected_str, "%ld", expectedCode); -+ (void)asprintf(&expected_str, "%ld", expectedCode); - _test_print("", (long) 0, desc, - (code == expectedCode), "%s", actual_str, "%s", expected_str); - -diff -Naur ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_io.c ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_io.c ---- ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_io.c 2020-09-02 02:28:48.000000000 -0500 -+++ ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_io.c 2021-01-19 11:19:09.286850562 -0600 -@@ -255,7 +255,7 @@ - test_stop(); - } - char *path_out = NULL; -- asprintf(&path_out, "%s\\dispatchtest_io.XXXXXX", temp_dir); -+ (void)asprintf(&path_out, "%s\\dispatchtest_io.XXXXXX", temp_dir); - #else - char path_out[] = "/tmp/dispatchtest_io.XXXXXX"; - #endif -@@ -486,7 +486,7 @@ - #if defined(_WIN32) - for (size_t i = 0; paths[i]; i++) { - char *search_path = NULL; -- asprintf(&search_path, "%s\\*", paths[i]); -+ (void)asprintf(&search_path, "%s\\*", paths[i]); - WIN32_FIND_DATAA node; - HANDLE find = FindFirstFileA(search_path, &node); - free(search_path); -@@ -503,7 +503,7 @@ - continue; - } - char *node_path = NULL; -- asprintf(&node_path, "%s\\%s", paths[i], node.cFileName); -+ (void)asprintf(&node_path, "%s\\%s", paths[i], node.cFileName); - if (node.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - char *subdir_paths[] = {node_path, NULL}; - test_enumerate_dir_trees(subdir_paths, process_file); -@@ -590,7 +590,7 @@ - test_ptr_notnull("SystemRoot", system_root); - test_stop(); - } -- asprintf(&paths[0], "%s\\System32", system_root); -+ (void)asprintf(&paths[0], "%s\\System32", system_root); - #else - char *paths[] = {"/usr/lib", NULL}; - #endif -diff -Naur ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_io_muxed.c ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_io_muxed.c ---- ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_io_muxed.c 2020-09-02 02:28:48.000000000 -0500 -+++ ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_io_muxed.c 2021-01-19 11:18:19.122416587 -0600 -@@ -64,7 +64,7 @@ - const char *path_separator = "/"; - #endif - char *path = NULL; -- asprintf(&path, "%s%sdispatchtest_io.XXXXXX", temp_dir, path_separator); -+ (void)asprintf(&path, "%s%sdispatchtest_io.XXXXXX", temp_dir, path_separator); - dispatch_fd_t fd = mkstemp(path); - if (fd == -1) { - test_errno("mkstemp", errno, 0); -diff -Naur ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_overcommit.c ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_overcommit.c ---- ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE-orig/tests/dispatch_overcommit.c 2020-09-02 02:28:48.000000000 -0500 -+++ ./swift-corelibs-libdispatch-swift-5.3.2-RELEASE/tests/dispatch_overcommit.c 2021-01-19 11:16:37.385536454 -0600 -@@ -48,7 +48,7 @@ - int i; - for (i = 0; i < final; ++i) { - char* name; -- asprintf(&name, "test.overcommit.%d", i); -+ (void)asprintf(&name, "test.overcommit.%d", i); - - dispatch_queue_t queue = dispatch_queue_create(name, NULL); - test_ptr_notnull("dispatch_queue_create", queue); diff --git a/libdispatch.spec b/libdispatch.spec index f5ea23b..8394d6d 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,18 +1,15 @@ -%global toolchain clang -%global reltag 5.3.3-RELEASE - +%global debug_package %{nil} +%global reltag 5.4.1-RELEASE Name: libdispatch -Version: 5.3.3 -Release: 2%{?dist} +Version: 5.4.1 +Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch Source0: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{reltag}.tar.gz#/corelibs-libdispatch.tar.gz -Patch0: asprintf.patch - BuildRequires: clang BuildRequires: libbsd-devel BuildRequires: ninja-build @@ -59,16 +56,13 @@ Development files for libdispatch %prep %setup -q -n swift-corelibs-libdispatch-swift-%{reltag} -%patch0 -p2 - %build -%cmake -G Ninja . -%cmake_build - +cmake -G Ninja -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_usr} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ . +ninja %install -%cmake_install +ninja install chrpath --delete %{buildroot}%{_libdir}/libdispatch.so @@ -86,7 +80,10 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog -* Mon Feb 08 2021 Ron Olson 5.3.3-2 -- Fixed issue with devel package not finding parent +* Tue Jun 01 2021 Ron Olson 5.4.1-1 +- Updated to 5.4.1-RELEASE +* Sat May 01 2021 Ron Olson 5.4-1 +- Updated to 5.4-RELEASE also added explicit CMake step + for EPEL8 * Wed Feb 03 2021 Ron Olson 5.3.3-1 - Initial version based on version 5.3.3-RELEASE diff --git a/sources b/sources index f362882..81b5909 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909 +SHA512 (corelibs-libdispatch.tar.gz) = a6ce5381d3776db5884ed691e2c22c0563da69cd3925c10f9de089a7f0e33dcbaec9d3afea4d58fa5cae819d104f9db7e81241b31ccc1bf8218d7923b2811a62 From 517318ee4592b3a9ad90358af7f281c1f0f588da Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 7 Jul 2021 08:48:43 -0500 Subject: [PATCH 05/22] Updated to libdispatch 5.4.2 --- libdispatch.spec | 6 ++++-- sources | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libdispatch.spec b/libdispatch.spec index 8394d6d..045dc39 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,8 +1,8 @@ %global debug_package %{nil} -%global reltag 5.4.1-RELEASE +%global reltag 5.4.2-RELEASE Name: libdispatch -Version: 5.4.1 +Version: 5.4.2 Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 @@ -80,6 +80,8 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Wed Jul 07 2021 Ron Olson 5.4.2-1 +- Updated to 5.4.2-RELEASE * Tue Jun 01 2021 Ron Olson 5.4.1-1 - Updated to 5.4.1-RELEASE * Sat May 01 2021 Ron Olson 5.4-1 diff --git a/sources b/sources index 81b5909..af64ec9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = a6ce5381d3776db5884ed691e2c22c0563da69cd3925c10f9de089a7f0e33dcbaec9d3afea4d58fa5cae819d104f9db7e81241b31ccc1bf8218d7923b2811a62 +SHA512 (corelibs-libdispatch.tar.gz) = ff30fda5a51db7b9883f31d1df3bffa0d80a5626cd66d9ff7a44d682b69fcbfc386f19c217ab0e3be9f72dd2ab0bfa0ebb9a781450231a602d0256d0440dc5a6 From 3d98a37ae84c22a353ccedd45c790a3ba76e57d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:12:11 +0000 Subject: [PATCH 06/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdispatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdispatch.spec b/libdispatch.spec index 045dc39..0c58bfe 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -3,7 +3,7 @@ Name: libdispatch Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -80,6 +80,9 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1:5.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 07 2021 Ron Olson 5.4.2-1 - Updated to 5.4.2-RELEASE * Tue Jun 01 2021 Ron Olson 5.4.1-1 From e54db22f00c8c12f3db213e403b322448eec9908 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 14 Dec 2021 15:32:09 -0600 Subject: [PATCH 07/22] Updated to 5.5.2-RELEASE --- libdispatch.spec | 27 +++++++++++++++++---------- sources | 2 +- unusedvariable.patch | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 unusedvariable.patch diff --git a/libdispatch.spec b/libdispatch.spec index 0c58bfe..1cc8b2d 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,15 +1,17 @@ -%global debug_package %{nil} -%global reltag 5.4.2-RELEASE +%global toolchain clang +%global reltag 5.5.2-RELEASE Name: libdispatch -Version: 5.4.2 -Release: 2%{?dist} +Version: 5.5.2 +Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch Source0: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{reltag}.tar.gz#/corelibs-libdispatch.tar.gz +Patch0: unusedvariable.patch + BuildRequires: clang BuildRequires: libbsd-devel BuildRequires: ninja-build @@ -56,13 +58,17 @@ Development files for libdispatch %prep %setup -q -n swift-corelibs-libdispatch-swift-%{reltag} +%patch0 -p1 %build -cmake -G Ninja -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_usr} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ . -ninja +export CXX=clang++ +export CC=clang +%cmake -G Ninja . +%cmake_build + %install -ninja install +%cmake_install chrpath --delete %{buildroot}%{_libdir}/libdispatch.so @@ -80,11 +86,12 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Tue Dec 14 2021 Ron Olson 5.5.2-1 +- Updated to 5.5.2-RELEASE +* Fri Oct 29 2021 Ron Olson 5.5.1-1 +- Updated to 5.5.1-RELEASE * Thu Jul 22 2021 Fedora Release Engineering - 1:5.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jul 07 2021 Ron Olson 5.4.2-1 -- Updated to 5.4.2-RELEASE * Tue Jun 01 2021 Ron Olson 5.4.1-1 - Updated to 5.4.1-RELEASE * Sat May 01 2021 Ron Olson 5.4-1 diff --git a/sources b/sources index af64ec9..865c6bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = ff30fda5a51db7b9883f31d1df3bffa0d80a5626cd66d9ff7a44d682b69fcbfc386f19c217ab0e3be9f72dd2ab0bfa0ebb9a781450231a602d0256d0440dc5a6 +SHA512 (corelibs-libdispatch.tar.gz) = 7fbae1786cd544a104dd97e2ca951bd6149f15a77badb14671fad98420c823d986c21117003de163b06a51b1acfa2dafc4f4fa99b3dc607a0e8f0ccd4e87ed8b diff --git a/unusedvariable.patch b/unusedvariable.patch new file mode 100644 index 0000000..e633cd1 --- /dev/null +++ b/unusedvariable.patch @@ -0,0 +1,35 @@ +diff --color -Naur swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c +--- swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c 2021-09-17 18:40:21.684025320 -0500 +@@ -479,6 +479,7 @@ + return; // stack or GC or global + } + refcount = byref->flags & BLOCK_REFCOUNT_MASK; ++ (void)refcount; + os_assert(refcount); + if (latching_decr_int_should_deallocate(&byref->flags)) { + if (byref->flags & BLOCK_BYREF_HAS_COPY_DISPOSE) { +diff --color -Naur swift-corelibs-libdispatch-orig/tests/bsdtestharness.c swift-corelibs-libdispatch/tests/bsdtestharness.c +--- swift-corelibs-libdispatch-orig/tests/bsdtestharness.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/tests/bsdtestharness.c 2021-09-17 18:39:05.679434477 -0500 +@@ -152,6 +152,7 @@ + assert(pid > 0); + + #if defined(__linux__) ++ (void)to; + int status; + struct rusage usage; + struct timeval tv_stop, tv_wall; +diff --color -Naur swift-corelibs-libdispatch-orig/tests/dispatch_apply.c swift-corelibs-libdispatch/tests/dispatch_apply.c +--- swift-corelibs-libdispatch-orig/tests/dispatch_apply.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/tests/dispatch_apply.c 2021-09-17 23:38:38.107488681 -0500 +@@ -56,7 +56,8 @@ + (void)ignored; + /* prevent i and j been optimized out */ + volatile uint64_t i = 0, j = 0; +- ++ (void)i; ++ (void)j; + OSAtomicIncrement32(&busy_threads_started); + + while(!all_done) From e5f3bda049e5859b70c555b3833d6879c516e74c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:01:45 +0000 Subject: [PATCH 08/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdispatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdispatch.spec b/libdispatch.spec index 1cc8b2d..7e51a25 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -3,7 +3,7 @@ Name: libdispatch Version: 5.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -86,6 +86,9 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1:5.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Ron Olson 5.5.2-1 - Updated to 5.5.2-RELEASE * Fri Oct 29 2021 Ron Olson 5.5.1-1 From afb289d68db6480e0ca8cdc415892462fc7421af Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 22 Mar 2022 11:29:23 -0500 Subject: [PATCH 09/22] Updated to 5.6-RELEASE --- libdispatch.spec | 17 ++++++----------- sources | 2 +- unusedvariable.patch | 35 ----------------------------------- 3 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 unusedvariable.patch diff --git a/libdispatch.spec b/libdispatch.spec index 7e51a25..1a576b4 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,16 +1,15 @@ %global toolchain clang -%global reltag 5.5.2-RELEASE +%global reltag 5.6-RELEASE Name: libdispatch -Version: 5.5.2 -Release: 2%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch Source0: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{reltag}.tar.gz#/corelibs-libdispatch.tar.gz -Patch0: unusedvariable.patch BuildRequires: clang BuildRequires: libbsd-devel @@ -58,12 +57,11 @@ Development files for libdispatch %prep %setup -q -n swift-corelibs-libdispatch-swift-%{reltag} -%patch0 -p1 %build export CXX=clang++ export CC=clang -%cmake -G Ninja . +%cmake -G Ninja %cmake_build @@ -86,15 +84,12 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 1:5.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - +* Tue Mar 22 2022 Ron Olson 5.6.0-1 +- Updated to 5.6.0-RELEASE * Tue Dec 14 2021 Ron Olson 5.5.2-1 - Updated to 5.5.2-RELEASE * Fri Oct 29 2021 Ron Olson 5.5.1-1 - Updated to 5.5.1-RELEASE -* Thu Jul 22 2021 Fedora Release Engineering - 1:5.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Tue Jun 01 2021 Ron Olson 5.4.1-1 - Updated to 5.4.1-RELEASE * Sat May 01 2021 Ron Olson 5.4-1 diff --git a/sources b/sources index 865c6bd..933c11b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = 7fbae1786cd544a104dd97e2ca951bd6149f15a77badb14671fad98420c823d986c21117003de163b06a51b1acfa2dafc4f4fa99b3dc607a0e8f0ccd4e87ed8b +SHA512 (corelibs-libdispatch.tar.gz) = e449329e3ced90a0e9a98486a041e0b37c150de3ea1eebcb449271bd878a1e555298b747db7280f0918d1f8db428dc831cf8db46dd77b047bae9023820472c97 diff --git a/unusedvariable.patch b/unusedvariable.patch deleted file mode 100644 index e633cd1..0000000 --- a/unusedvariable.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --color -Naur swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c ---- swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c 2020-08-14 16:49:59.000000000 -0500 -+++ swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c 2021-09-17 18:40:21.684025320 -0500 -@@ -479,6 +479,7 @@ - return; // stack or GC or global - } - refcount = byref->flags & BLOCK_REFCOUNT_MASK; -+ (void)refcount; - os_assert(refcount); - if (latching_decr_int_should_deallocate(&byref->flags)) { - if (byref->flags & BLOCK_BYREF_HAS_COPY_DISPOSE) { -diff --color -Naur swift-corelibs-libdispatch-orig/tests/bsdtestharness.c swift-corelibs-libdispatch/tests/bsdtestharness.c ---- swift-corelibs-libdispatch-orig/tests/bsdtestharness.c 2020-08-14 16:49:59.000000000 -0500 -+++ swift-corelibs-libdispatch/tests/bsdtestharness.c 2021-09-17 18:39:05.679434477 -0500 -@@ -152,6 +152,7 @@ - assert(pid > 0); - - #if defined(__linux__) -+ (void)to; - int status; - struct rusage usage; - struct timeval tv_stop, tv_wall; -diff --color -Naur swift-corelibs-libdispatch-orig/tests/dispatch_apply.c swift-corelibs-libdispatch/tests/dispatch_apply.c ---- swift-corelibs-libdispatch-orig/tests/dispatch_apply.c 2020-08-14 16:49:59.000000000 -0500 -+++ swift-corelibs-libdispatch/tests/dispatch_apply.c 2021-09-17 23:38:38.107488681 -0500 -@@ -56,7 +56,8 @@ - (void)ignored; - /* prevent i and j been optimized out */ - volatile uint64_t i = 0, j = 0; -- -+ (void)i; -+ (void)j; - OSAtomicIncrement32(&busy_threads_started); - - while(!all_done) From 25af95f6d1b833784376636231f440b0e3a5a3a1 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 23 Mar 2022 16:21:29 -0500 Subject: [PATCH 10/22] Added patch to allow for building under EPEL-8 --- libdispatch.spec | 6 +++++- noerrors.patch | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 noerrors.patch diff --git a/libdispatch.spec b/libdispatch.spec index 1a576b4..448e891 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -3,13 +3,14 @@ Name: libdispatch Version: 5.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch Source0: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{reltag}.tar.gz#/corelibs-libdispatch.tar.gz +Patch0: noerrors.patch BuildRequires: clang BuildRequires: libbsd-devel @@ -57,6 +58,7 @@ Development files for libdispatch %prep %setup -q -n swift-corelibs-libdispatch-swift-%{reltag} +%patch0 -p0 %build export CXX=clang++ @@ -84,6 +86,8 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Wed Mar 23 2022 Ron Olson 5.6.0-2 +- Added patch to allow for building on EPEL-8 * Tue Mar 22 2022 Ron Olson 5.6.0-1 - Updated to 5.6.0-RELEASE * Tue Dec 14 2021 Ron Olson 5.5.2-1 diff --git a/noerrors.patch b/noerrors.patch new file mode 100644 index 0000000..9640ceb --- /dev/null +++ b/noerrors.patch @@ -0,0 +1,10 @@ +--- cmake/modules/DispatchCompilerWarnings.cmake.orig 2022-03-23 15:34:30.474065670 -0500 ++++ cmake/modules/DispatchCompilerWarnings.cmake 2022-03-23 15:46:39.228684206 -0500 +@@ -2,7 +2,6 @@ + if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") + # TODO: someone needs to provide the msvc equivalent warning flags + else() +- add_compile_options($<$,$>:-Werror>) + add_compile_options($<$,$>:-Wall>) + add_compile_options($<$,$>:-Wextra>) + From 9c627cab7a1263f714f502312e3cfdb62101eaa5 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 15 Apr 2022 09:41:24 -0500 Subject: [PATCH 11/22] Updated to 5.6.1-RELEASE --- libdispatch.spec | 8 +++++--- sources | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libdispatch.spec b/libdispatch.spec index 448e891..2c7ecad 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,9 +1,9 @@ %global toolchain clang -%global reltag 5.6-RELEASE +%global reltag 5.6.1-RELEASE Name: libdispatch -Version: 5.6.0 -Release: 2%{?dist} +Version: 5.6.1 +Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -86,6 +86,8 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Fri Apr 15 2022 Ron Olson 5.6.1-1 +- Updated to 5.6.1-RELEASE * Wed Mar 23 2022 Ron Olson 5.6.0-2 - Added patch to allow for building on EPEL-8 * Tue Mar 22 2022 Ron Olson 5.6.0-1 diff --git a/sources b/sources index 933c11b..a5eae21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = e449329e3ced90a0e9a98486a041e0b37c150de3ea1eebcb449271bd878a1e555298b747db7280f0918d1f8db428dc831cf8db46dd77b047bae9023820472c97 +SHA512 (corelibs-libdispatch.tar.gz) = 083a8ebdea87cc04f856db1833adcfca83b16568cff311123ccc6a835f73979ac1051f1733feacfa04155fcabc97f561738adf8e871468e808cf8048bea063b1 From 0a566608a7d292bbfd55078678a83ca21af08047 Mon Sep 17 00:00:00 2001 From: Shawn Anastasio Date: Thu, 12 May 2022 14:24:54 -0400 Subject: [PATCH 12/22] Added ppc64le to architecture list --- libdispatch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdispatch.spec b/libdispatch.spec index 2c7ecad..3dba1c4 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -18,7 +18,7 @@ BuildRequires: ninja-build BuildRequires: cmake BuildRequires: chrpath -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: x86_64 aarch64 ppc64le Provides: libblocksruntime = %{version}-%{release} Obsoletes: libblocksruntime < 7.0.0-5 From 20d57f9251023e795e0370d5983bcf412b3b9412 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 12 May 2022 13:46:28 -0500 Subject: [PATCH 13/22] Added ppc64le as one of the architectures thanks to Shawn Anastasio --- libdispatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdispatch.spec b/libdispatch.spec index 3dba1c4..2d9b7a3 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -3,7 +3,7 @@ Name: libdispatch Version: 5.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -86,6 +86,9 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Thu May 12 2022 Ron Olson 5.6.1-2 +- Merged patch 0a56660 from Shawn Anastasio to include + ppc64le as one of the architectures to build for * Fri Apr 15 2022 Ron Olson 5.6.1-1 - Updated to 5.6.1-RELEASE * Wed Mar 23 2022 Ron Olson 5.6.0-2 From 0e6fec09dec0fae40012cb2402776e3610fc7ab9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:35:50 +0000 Subject: [PATCH 14/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdispatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdispatch.spec b/libdispatch.spec index 2d9b7a3..7127441 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -3,7 +3,7 @@ Name: libdispatch Version: 5.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -86,6 +86,9 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1:5.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu May 12 2022 Ron Olson 5.6.1-2 - Merged patch 0a56660 from Shawn Anastasio to include ppc64le as one of the architectures to build for From 65bd74e9d68c73d88f52eb725ebbdff098dc26d7 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 5 Dec 2022 13:02:12 -0600 Subject: [PATCH 15/22] Updated to 5.7.1 --- libdispatch.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libdispatch.spec b/libdispatch.spec index 7127441..dc5a3e3 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,9 +1,9 @@ %global toolchain clang -%global reltag 5.6.1-RELEASE +%global reltag 5.7.1-RELEASE Name: libdispatch -Version: 5.6.1 -Release: 3%{?dist} +Version: 5.7.1 +Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -86,6 +86,8 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Mon Dec 05 2022 Ron Olson 5.7.1-1 +- Updated to 5.7.1-RELEASE * Thu Jul 21 2022 Fedora Release Engineering - 1:5.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1e28e0e4d9c23484b9fb6f757a083d4349835850 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 5 Dec 2022 13:02:54 -0600 Subject: [PATCH 16/22] Updated to 5.7.1 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index a5eae21..665ddbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = 083a8ebdea87cc04f856db1833adcfca83b16568cff311123ccc6a835f73979ac1051f1733feacfa04155fcabc97f561738adf8e871468e808cf8048bea063b1 +SHA512 (corelibs-libdispatch.tar.gz) = 7f04c14cfba214d99ffbb1d6d5ae2d0b83a0e3d3597c886093993f55adef53995477d9d88207ad36facc67cd36c46e1380f57fdc847f9a5f079aa41b820ecf4f From 655f40bb8f9ab76e64c9df89efe3fc16638f71cf Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 16 Dec 2022 10:36:45 -0600 Subject: [PATCH 17/22] Updated to 5.7.2-RELEASE --- libdispatch.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libdispatch.spec b/libdispatch.spec index dc5a3e3..26c8af7 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,11 +1,11 @@ %global toolchain clang -%global reltag 5.7.1-RELEASE +%global reltag 5.7.2-RELEASE Name: libdispatch -Version: 5.7.1 +Version: 5.7.2 Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/apple/swift-corelibs-libdispatch Source0: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{reltag}.tar.gz#/corelibs-libdispatch.tar.gz @@ -86,6 +86,9 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Fri Dec 16 2022 Ron Olson 5.7.2-1 +- Updated to 5.7.2-RELEASE + SPDX migration * Mon Dec 05 2022 Ron Olson 5.7.1-1 - Updated to 5.7.1-RELEASE * Thu Jul 21 2022 Fedora Release Engineering - 1:5.6.1-3 diff --git a/sources b/sources index 665ddbb..347c5b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = 7f04c14cfba214d99ffbb1d6d5ae2d0b83a0e3d3597c886093993f55adef53995477d9d88207ad36facc67cd36c46e1380f57fdc847f9a5f079aa41b820ecf4f +SHA512 (corelibs-libdispatch.tar.gz) = 558495e5055d5a67b81d0cfcb1376b9b24b49ac80e9805b38e58134f3093aab8809d584abe9e1e977a3e7bdc57b1e127d43e7f1e9c33eb59df536341637db653 From a3a209433c92bd04739812bb11be0ca40f17aa10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:07:47 +0000 Subject: [PATCH 18/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdispatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdispatch.spec b/libdispatch.spec index 26c8af7..682eefc 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -3,7 +3,7 @@ Name: libdispatch Version: 5.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Grand Central Dispatch library License: Apache-2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -86,6 +86,9 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1:5.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 16 2022 Ron Olson 5.7.2-1 - Updated to 5.7.2-RELEASE SPDX migration From 9c27dc72dd4372c48d92f260b472af918416e28f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 27 Jan 2023 11:49:47 -0600 Subject: [PATCH 19/22] Updated to 5.7.3-RELEASE --- libdispatch.spec | 8 +++++--- sources | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libdispatch.spec b/libdispatch.spec index 682eefc..ef4473a 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,9 +1,9 @@ %global toolchain clang -%global reltag 5.7.2-RELEASE +%global reltag 5.7.3-RELEASE Name: libdispatch -Version: 5.7.2 -Release: 2%{?dist} +Version: 5.7.3 +Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: Apache-2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -86,6 +86,8 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Fri Jan 27 2023 Ron Olson 5.7.3-1 +- Updated to 5.7.3-RELEASE * Thu Jan 19 2023 Fedora Release Engineering - 1:5.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 347c5b9..ed8500c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = 558495e5055d5a67b81d0cfcb1376b9b24b49ac80e9805b38e58134f3093aab8809d584abe9e1e977a3e7bdc57b1e127d43e7f1e9c33eb59df536341637db653 +SHA512 (corelibs-libdispatch.tar.gz) = 7d8f40ff7a43ac0367552855317e73e140ba7ff7d2b6494aa772ba052fd7d1a151b0122465b6a82a7e4483e8dd951e77d6b626d63e0997c9a64e3a2bc6d66250 From d02143f2790a18129edf23c6dcad2eda9d31356f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:38:58 +0000 Subject: [PATCH 20/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdispatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdispatch.spec b/libdispatch.spec index ef4473a..d1bf325 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -3,7 +3,7 @@ Name: libdispatch Version: 5.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Grand Central Dispatch library License: Apache-2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -86,6 +86,9 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1:5.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 27 2023 Ron Olson 5.7.3-1 - Updated to 5.7.3-RELEASE * Thu Jan 19 2023 Fedora Release Engineering - 1:5.7.2-2 From 8c8d00e7b9e5e95bde3ec2bcafa6d4e44470cf58 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 28 Sep 2023 08:27:58 -0500 Subject: [PATCH 21/22] Updated to 5.9-RELEASE --- libdispatch.spec | 12 ++++++++---- sources | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libdispatch.spec b/libdispatch.spec index d1bf325..33e8a8f 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,9 +1,9 @@ %global toolchain clang -%global reltag 5.7.3-RELEASE +%global reltag 5.9-RELEASE Name: libdispatch -Version: 5.7.3 -Release: 2%{?dist} +Version: 5.9 +Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: Apache-2.0 URL: https://github.com/apple/swift-corelibs-libdispatch @@ -58,7 +58,8 @@ Development files for libdispatch %prep %setup -q -n swift-corelibs-libdispatch-swift-%{reltag} -%patch0 -p0 +%patch -P0 -p0 + %build export CXX=clang++ @@ -86,6 +87,9 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Thu Sep 28 2023 Ron Olson 5.9-1 +- Updated to 5.9-RELEASE + * Thu Jul 20 2023 Fedora Release Engineering - 1:5.7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index ed8500c..d4c40ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = 7d8f40ff7a43ac0367552855317e73e140ba7ff7d2b6494aa772ba052fd7d1a151b0122465b6a82a7e4483e8dd951e77d6b626d63e0997c9a64e3a2bc6d66250 +SHA512 (corelibs-libdispatch.tar.gz) = f7a6e8e5f450d63c8b6c9ed70f2099b669105f5f6d7ec1f6139fc3b4b5d30cc584b52d7d3c1e89a43252ab1dd56044417d57c6b9dcbf41edcabca0160c349165 From 809fab45ed85cc59d5de14c9369e629b959130e3 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:02:27 +0300 Subject: [PATCH 22/22] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index f76c3ba..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# libdispatch - -The libdispatch package diff --git a/sources b/sources deleted file mode 100644 index d4c40ee..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (corelibs-libdispatch.tar.gz) = f7a6e8e5f450d63c8b6c9ed70f2099b669105f5f6d7ec1f6139fc3b4b5d30cc584b52d7d3c1e89a43252ab1dd56044417d57c6b9dcbf41edcabca0160c349165