From 3538a1233f95c6da970fb2fe8683ede6bc9863d1 Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Thu, 10 Mar 2022 11:02:54 -0800 Subject: [PATCH 1/3] Update the RPM spec files to support release/5.6 --- .../2/patches/swift-api-checker.patch | 9 -- .../Linux/RPM/Amazonlinux/2/swiftlang.spec | 44 ++++-- .../Centos/7/patches/swift-api-checker.patch | 9 -- platforms/Linux/RPM/Centos/7/swiftlang.spec | 44 ++++-- .../Centos/8/patches/swift-api-checker.patch | 9 -- platforms/Linux/RPM/Centos/8/swiftlang.spec | 43 ++++-- platforms/Linux/RPM/Fedora/34/swiftlang.spec | 120 ++++++++++------ platforms/Linux/RPM/Fedora/35/swiftlang.spec | 121 +++++++++++------ .../Linux/RPM/Fedora/rawhide/swiftlang.spec | 128 ++++++++++++------ platforms/Linux/RPM/metadata.inc | 12 +- 10 files changed, 350 insertions(+), 189 deletions(-) delete mode 100644 platforms/Linux/RPM/Amazonlinux/2/patches/swift-api-checker.patch delete mode 100644 platforms/Linux/RPM/Centos/7/patches/swift-api-checker.patch delete mode 100644 platforms/Linux/RPM/Centos/8/patches/swift-api-checker.patch diff --git a/platforms/Linux/RPM/Amazonlinux/2/patches/swift-api-checker.patch b/platforms/Linux/RPM/Amazonlinux/2/patches/swift-api-checker.patch deleted file mode 100644 index b087ef09..00000000 --- a/platforms/Linux/RPM/Amazonlinux/2/patches/swift-api-checker.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/swift/utils/api_checker/swift-api-checker.py b/swift/utils/api_checker/swift-api-checker.py -index 8ed16b4abf7..0b11a4bb83a 100755 ---- a/swift/utils/api_checker/swift-api-checker.py -+++ b/swift/utils/api_checker/swift-api-checker.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import print_function diff --git a/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec b/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec index 704c61ba..76c4cdb8 100644 --- a/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec +++ b/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec @@ -26,13 +26,26 @@ Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_a Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip#/yams.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz - -Patch0: patches/swift-api-checker.patch -Patch1: patches/hwasan_symbolize.patch +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz + + +Patch0: patches/hwasan_symbolize.patch BuildRequires: clang BuildRequires: curl-devel @@ -92,7 +105,8 @@ importantly, Swift is designed to make writing and maintaining correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 + # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -115,6 +129,19 @@ mv swift-driver-swift-%{swift_version} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto mv ninja-%{ninja_version} ninja mv CMake-%{cmake_version} cmake +mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm +mv swift-docc-swift-%{swift_version} swift-docc +mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-system-%{swift_system_version} swift-system +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-format-swift-%{swift_version} swift-format +mv swift-lmdb-swift-%{swift_version} swift-lmdb +mv swift-markdown-swift-%{swift_version} swift-markdown # ICU mv icu-release-%{icu_version} icu @@ -122,17 +149,14 @@ mv icu-release-%{icu_version} icu # Yams mv Yams-%{yams_version} yams -# Adjust python version swift-api-checker -%patch0 -p1 - # Adjust python version hwasan_symbolize -%patch1 -p1 +%patch0 -p1 %build export VERBOSE=1 # Run the build -swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-amazonlinux2.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-amazonlinux2.tar.gz %install mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version} diff --git a/platforms/Linux/RPM/Centos/7/patches/swift-api-checker.patch b/platforms/Linux/RPM/Centos/7/patches/swift-api-checker.patch deleted file mode 100644 index b087ef09..00000000 --- a/platforms/Linux/RPM/Centos/7/patches/swift-api-checker.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/swift/utils/api_checker/swift-api-checker.py b/swift/utils/api_checker/swift-api-checker.py -index 8ed16b4abf7..0b11a4bb83a 100755 ---- a/swift/utils/api_checker/swift-api-checker.py -+++ b/swift/utils/api_checker/swift-api-checker.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import print_function diff --git a/platforms/Linux/RPM/Centos/7/swiftlang.spec b/platforms/Linux/RPM/Centos/7/swiftlang.spec index 87cd25ec..d88564e3 100644 --- a/platforms/Linux/RPM/Centos/7/swiftlang.spec +++ b/platforms/Linux/RPM/Centos/7/swiftlang.spec @@ -26,13 +26,26 @@ Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_a Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip#/yams.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz - -Patch0: patches/swift-api-checker.patch -Patch1: patches/hwasan_symbolize.patch +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz + + +Patch0: patches/hwasan_symbolize.patch BuildRequires: autoconf BuildRequires: devtoolset-8 @@ -92,7 +105,8 @@ importantly, Swift is designed to make writing and maintaining correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 + # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -115,6 +129,19 @@ mv swift-driver-swift-%{swift_version} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto mv ninja-%{ninja_version} ninja mv CMake-%{cmake_version} cmake +mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm +mv swift-docc-swift-%{swift_version} swift-docc +mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-system-%{swift_system_version} swift-system +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-format-swift-%{swift_version} swift-format +mv swift-lmdb-swift-%{swift_version} swift-lmdb +mv swift-markdown-swift-%{swift_version} swift-markdown # ICU mv icu-release-%{icu_version} icu @@ -122,17 +149,14 @@ mv icu-release-%{icu_version} icu # Yams mv Yams-%{yams_version} yams -# Adjust python version swift-api-checker -%patch0 -p1 - # Adjust python version hwasan_symbolize -%patch1 -p1 +%patch0 -p1 %build export VERBOSE=1 # Run the build -swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos7.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos7.tar.gz %install mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version} diff --git a/platforms/Linux/RPM/Centos/8/patches/swift-api-checker.patch b/platforms/Linux/RPM/Centos/8/patches/swift-api-checker.patch deleted file mode 100644 index b087ef09..00000000 --- a/platforms/Linux/RPM/Centos/8/patches/swift-api-checker.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/swift/utils/api_checker/swift-api-checker.py b/swift/utils/api_checker/swift-api-checker.py -index 8ed16b4abf7..0b11a4bb83a 100755 ---- a/swift/utils/api_checker/swift-api-checker.py -+++ b/swift/utils/api_checker/swift-api-checker.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import print_function diff --git a/platforms/Linux/RPM/Centos/8/swiftlang.spec b/platforms/Linux/RPM/Centos/8/swiftlang.spec index ea2f48dd..c25b2916 100644 --- a/platforms/Linux/RPM/Centos/8/swiftlang.spec +++ b/platforms/Linux/RPM/Centos/8/swiftlang.spec @@ -26,13 +26,25 @@ Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_a Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip#/yams.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz - -Patch0: patches/swift-api-checker.patch -Patch1: patches/hwasan_symbolize.patch +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz + +Patch0: patches/hwasan_symbolize.patch BuildRequires: autoconf BuildRequires: clang @@ -91,7 +103,8 @@ importantly, Swift is designed to make writing and maintaining correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 + # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -114,6 +127,19 @@ mv swift-driver-swift-%{swift_version} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto mv ninja-%{ninja_version} ninja mv CMake-%{cmake_version} cmake +mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm +mv swift-docc-swift-%{swift_version} swift-docc +mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-system-%{swift_system_version} swift-system +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-format-swift-%{swift_version} swift-format +mv swift-lmdb-swift-%{swift_version} swift-lmdb +mv swift-markdown-swift-%{swift_version} swift-markdown # ICU mv icu-release-%{icu_version} icu @@ -121,11 +147,8 @@ mv icu-release-%{icu_version} icu # Yams mv Yams-%{yams_version} yams -# Adjust python version swift-api-checker -%patch0 -p1 - # Adjust python version hwasan_symbolize -%patch1 -p1 +%patch0 -p1 # Fix python to python3 ln -s /usr/bin/python3 /usr/bin/python @@ -134,7 +157,7 @@ ln -s /usr/bin/python3 /usr/bin/python export VERBOSE=1 # Run the build -swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos8.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos8.tar.gz %install mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version} diff --git a/platforms/Linux/RPM/Fedora/34/swiftlang.spec b/platforms/Linux/RPM/Fedora/34/swiftlang.spec index ee81de1d..a7785c29 100644 --- a/platforms/Linux/RPM/Fedora/34/swiftlang.spec +++ b/platforms/Linux/RPM/Fedora/34/swiftlang.spec @@ -1,41 +1,62 @@ %global debug_package %{nil} %global linux_version fedora -%global swifttag 5.5.3-RELEASE -%global swiftbuild swift-source +%global swift_version 5.6-RELEASE +%global package_version 5.6.0 +%global swift_source_location swift-source %global icu_version 65-1 %global yams_version 4.0.2 -%global sap_version 0.4.3 +%global swift_argument_parser_version 1.0.3 %global swift_crypto_version 1.1.5 %global ninja_version 1.10.2 -%global package_version 5.5.3 +%global cmake_version 3.19.6 +%global swift_atomics_version 1.0.2 +%global swift_collections_version 1.0.1 +%global swift_numerics_version 1.0.1 +%global swift_system_version 1.1.1 +%global swift_nio_version 2.31.2 +%global swift_nio_ssl_version 2.15.0 Name: swiftlang -Version: 5.5.3 +Version: 5.6.0 Release: 1%{?dist} Summary: The Swift programming language License: Apache 2.0 URL: https://www.swift.org -Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz -Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz -Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz -Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz -Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz -Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz -Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz -Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz -Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz -Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz -Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz -Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz -Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz -Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz -Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz -Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip -Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz +Source0: https://github.com/apple/swift/archive/swift-%{swift_version}.tar.gz#/swift.tar.gz +Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swift_version}.tar.gz#/corelibs-libdispatch.tar.gz +Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swift_version}.tar.gz#/corelibs-foundation.tar.gz +Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swift_version}.tar.gz#/swift-integration-tests.tar.gz +Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swift_version}.tar.gz#/corelibs-xctest.tar.gz +Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swift_version}.tar.gz#/package-manager.tar.gz +Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swift_version}.tar.gz#/llbuild.tar.gz +Source7: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}.tar.gz#/cmark.tar.gz +Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swift_version}.tar.gz#/swift-xcode-playground-support.tar.gz +Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swift_version}.tar.gz#/sourcekit-lsp.tar.gz +Source10: https://github.com/apple/indexstore-db/archive/swift-%{swift_version}.tar.gz#/indexstore-db.tar.gz +Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_version}.tar.gz#/llvm-project.tar.gz +Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz +Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz +Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz +Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz Patch0: nocyclades.patch Patch1: unusedvariable.patch @@ -86,27 +107,42 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary -mv swift-cmark-swift-%{swifttag} cmark -mv swift-corelibs-foundation-swift-%{swifttag} swift-corelibs-foundation -mv swift-corelibs-libdispatch-swift-%{swifttag} swift-corelibs-libdispatch -mv swift-corelibs-xctest-swift-%{swifttag} swift-corelibs-xctest -mv swift-integration-tests-swift-%{swifttag} swift-integration-tests -mv swift-llbuild-swift-%{swifttag} llbuild -mv swift-package-manager-swift-%{swifttag} swiftpm -mv swift-swift-%{swifttag} swift -mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support -mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp -mv indexstore-db-swift-%{swifttag} indexstore-db -mv llvm-project-swift-%{swifttag} llvm-project -mv swift-syntax-swift-%{swifttag} swift-syntax -mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core -mv swift-argument-parser-%{sap_version} swift-argument-parser -mv swift-driver-swift-%{swifttag} swift-driver +mv swift-cmark-swift-%{swift_version} cmark +mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation +mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch +mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest +mv swift-integration-tests-swift-%{swift_version} swift-integration-tests +mv swift-llbuild-swift-%{swift_version} llbuild +mv swift-package-manager-swift-%{swift_version} swiftpm +mv swift-swift-%{swift_version} swift +mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support +mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv indexstore-db-swift-%{swift_version} indexstore-db +mv llvm-project-swift-%{swift_version} llvm-project +mv swift-syntax-swift-%{swift_version} swift-syntax +mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core +mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser +mv swift-driver-swift-%{swift_version} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto +mv ninja-%{ninja_version} ninja +mv CMake-%{cmake_version} cmake +mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm +mv swift-docc-swift-%{swift_version} swift-docc +mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-system-%{swift_system_version} swift-system +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-format-swift-%{swift_version} swift-format +mv swift-lmdb-swift-%{swift_version} swift-lmdb +mv swift-markdown-swift-%{swift_version} swift-markdown # ICU mv icu-release-%{icu_version} icu @@ -139,7 +175,7 @@ export PATH=$PWD/binforpython:$PATH %endif # Here we go! -swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz %install diff --git a/platforms/Linux/RPM/Fedora/35/swiftlang.spec b/platforms/Linux/RPM/Fedora/35/swiftlang.spec index ee81de1d..bcfbce2e 100644 --- a/platforms/Linux/RPM/Fedora/35/swiftlang.spec +++ b/platforms/Linux/RPM/Fedora/35/swiftlang.spec @@ -1,41 +1,63 @@ %global debug_package %{nil} %global linux_version fedora -%global swifttag 5.5.3-RELEASE -%global swiftbuild swift-source +%global swift_version 5.6-RELEASE +%global package_version 5.6.0 +%global swift_source_location swift-source +%global sap_version 0.4.3 %global icu_version 65-1 %global yams_version 4.0.2 -%global sap_version 0.4.3 +%global swift_argument_parser_version 1.0.3 %global swift_crypto_version 1.1.5 %global ninja_version 1.10.2 -%global package_version 5.5.3 +%global cmake_version 3.19.6 +%global swift_atomics_version 1.0.2 +%global swift_collections_version 1.0.1 +%global swift_numerics_version 1.0.1 +%global swift_system_version 1.1.1 +%global swift_nio_version 2.31.2 +%global swift_nio_ssl_version 2.15.0 Name: swiftlang -Version: 5.5.3 +Version: ${package_version} Release: 1%{?dist} Summary: The Swift programming language License: Apache 2.0 URL: https://www.swift.org -Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz -Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz -Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz -Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz -Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz -Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz -Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz -Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz -Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz -Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz -Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz -Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz -Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz -Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz -Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz -Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip -Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz +Source0: https://github.com/apple/swift/archive/swift-%{swift_version}.tar.gz#/swift.tar.gz +Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swift_version}.tar.gz#/corelibs-libdispatch.tar.gz +Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swift_version}.tar.gz#/corelibs-foundation.tar.gz +Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swift_version}.tar.gz#/swift-integration-tests.tar.gz +Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swift_version}.tar.gz#/corelibs-xctest.tar.gz +Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swift_version}.tar.gz#/package-manager.tar.gz +Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swift_version}.tar.gz#/llbuild.tar.gz +Source7: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}.tar.gz#/cmark.tar.gz +Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swift_version}.tar.gz#/swift-xcode-playground-support.tar.gz +Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swift_version}.tar.gz#/sourcekit-lsp.tar.gz +Source10: https://github.com/apple/indexstore-db/archive/swift-%{swift_version}.tar.gz#/indexstore-db.tar.gz +Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_version}.tar.gz#/llvm-project.tar.gz +Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz +Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz +Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz +Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz Patch0: nocyclades.patch Patch1: unusedvariable.patch @@ -86,27 +108,42 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary -mv swift-cmark-swift-%{swifttag} cmark -mv swift-corelibs-foundation-swift-%{swifttag} swift-corelibs-foundation -mv swift-corelibs-libdispatch-swift-%{swifttag} swift-corelibs-libdispatch -mv swift-corelibs-xctest-swift-%{swifttag} swift-corelibs-xctest -mv swift-integration-tests-swift-%{swifttag} swift-integration-tests -mv swift-llbuild-swift-%{swifttag} llbuild -mv swift-package-manager-swift-%{swifttag} swiftpm -mv swift-swift-%{swifttag} swift -mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support -mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp -mv indexstore-db-swift-%{swifttag} indexstore-db -mv llvm-project-swift-%{swifttag} llvm-project -mv swift-syntax-swift-%{swifttag} swift-syntax -mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core -mv swift-argument-parser-%{sap_version} swift-argument-parser -mv swift-driver-swift-%{swifttag} swift-driver +mv swift-cmark-swift-%{swift_version} cmark +mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation +mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch +mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest +mv swift-integration-tests-swift-%{swift_version} swift-integration-tests +mv swift-llbuild-swift-%{swift_version} llbuild +mv swift-package-manager-swift-%{swift_version} swiftpm +mv swift-swift-%{swift_version} swift +mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support +mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv indexstore-db-swift-%{swift_version} indexstore-db +mv llvm-project-swift-%{swift_version} llvm-project +mv swift-syntax-swift-%{swift_version} swift-syntax +mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core +mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser +mv swift-driver-swift-%{swift_version} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto +mv ninja-%{ninja_version} ninja +mv CMake-%{cmake_version} cmake +mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm +mv swift-docc-swift-%{swift_version} swift-docc +mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-system-%{swift_system_version} swift-system +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-format-swift-%{swift_version} swift-format +mv swift-lmdb-swift-%{swift_version} swift-lmdb +mv swift-markdown-swift-%{swift_version} swift-markdown # ICU mv icu-release-%{icu_version} icu @@ -139,7 +176,7 @@ export PATH=$PWD/binforpython:$PATH %endif # Here we go! -swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz %install diff --git a/platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec b/platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec index c6442e0d..81389bc3 100644 --- a/platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec +++ b/platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec @@ -1,40 +1,63 @@ %global debug_package %{nil} %global linux_version fedora -%global swifttag 5.5.2-RELEASE -%global swiftbuild swift-source +%global swift_version 5.6-RELEASE +%global package_version 5.6.0 +%global swift_source_location swift-source +%global sap_version 0.4.3 %global icu_version 65-1 %global yams_version 4.0.2 -%global sap_version 0.4.3 +%global swift_argument_parser_version 1.0.3 %global swift_crypto_version 1.1.5 %global ninja_version 1.10.2 +%global cmake_version 3.19.6 +%global swift_atomics_version 1.0.2 +%global swift_collections_version 1.0.1 +%global swift_numerics_version 1.0.1 +%global swift_system_version 1.1.1 +%global swift_nio_version 2.31.2 +%global swift_nio_ssl_version 2.15.0 Name: swiftlang -Version: 5.5.2 +Version: ${package_version} Release: 1%{?dist} -Summary: Apple's Swift programming language -License: ASL 2.0 and Unicode -URL: https://swift.org - -Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz -Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz -Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz -Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz -Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz -Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz -Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz -Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz -Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz -Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz -Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz -Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz -Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz -Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz -Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz -Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip -Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz +Summary: The Swift programming language +License: Apache 2.0 +URL: https://www.swift.org + +Source0: https://github.com/apple/swift/archive/swift-%{swift_version}.tar.gz#/swift.tar.gz +Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swift_version}.tar.gz#/corelibs-libdispatch.tar.gz +Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swift_version}.tar.gz#/corelibs-foundation.tar.gz +Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swift_version}.tar.gz#/swift-integration-tests.tar.gz +Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swift_version}.tar.gz#/corelibs-xctest.tar.gz +Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swift_version}.tar.gz#/package-manager.tar.gz +Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swift_version}.tar.gz#/llbuild.tar.gz +Source7: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}.tar.gz#/cmark.tar.gz +Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swift_version}.tar.gz#/swift-xcode-playground-support.tar.gz +Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swift_version}.tar.gz#/sourcekit-lsp.tar.gz +Source10: https://github.com/apple/indexstore-db/archive/swift-%{swift_version}.tar.gz#/indexstore-db.tar.gz +Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_version}.tar.gz#/llvm-project.tar.gz +Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz +Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz +Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz +Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz Patch0: nocyclades.patch Patch1: unusedvariable.patch @@ -85,27 +108,42 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary -mv swift-cmark-swift-%{swifttag} cmark -mv swift-corelibs-foundation-swift-%{swifttag} swift-corelibs-foundation -mv swift-corelibs-libdispatch-swift-%{swifttag} swift-corelibs-libdispatch -mv swift-corelibs-xctest-swift-%{swifttag} swift-corelibs-xctest -mv swift-integration-tests-swift-%{swifttag} swift-integration-tests -mv swift-llbuild-swift-%{swifttag} llbuild -mv swift-package-manager-swift-%{swifttag} swiftpm -mv swift-swift-%{swifttag} swift -mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support -mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp -mv indexstore-db-swift-%{swifttag} indexstore-db -mv llvm-project-swift-%{swifttag} llvm-project -mv swift-syntax-swift-%{swifttag} swift-syntax -mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core -mv swift-argument-parser-%{sap_version} swift-argument-parser -mv swift-driver-swift-%{swifttag} swift-driver +mv swift-cmark-swift-%{swift_version} cmark +mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation +mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch +mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest +mv swift-integration-tests-swift-%{swift_version} swift-integration-tests +mv swift-llbuild-swift-%{swift_version} llbuild +mv swift-package-manager-swift-%{swift_version} swiftpm +mv swift-swift-%{swift_version} swift +mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support +mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv indexstore-db-swift-%{swift_version} indexstore-db +mv llvm-project-swift-%{swift_version} llvm-project +mv swift-syntax-swift-%{swift_version} swift-syntax +mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core +mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser +mv swift-driver-swift-%{swift_version} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto +mv ninja-%{ninja_version} ninja +mv CMake-%{cmake_version} cmake +mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm +mv swift-docc-swift-%{swift_version} swift-docc +mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-system-%{swift_system_version} swift-system +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-format-swift-%{swift_version} swift-format +mv swift-lmdb-swift-%{swift_version} swift-lmdb +mv swift-markdown-swift-%{swift_version} swift-markdown # ICU mv icu-release-%{icu_version} icu @@ -138,7 +176,7 @@ export PATH=$PWD/binforpython:$PATH %endif # Here we go! -swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz %install diff --git a/platforms/Linux/RPM/metadata.inc b/platforms/Linux/RPM/metadata.inc index f8fb223a..56be6b70 100644 --- a/platforms/Linux/RPM/metadata.inc +++ b/platforms/Linux/RPM/metadata.inc @@ -1,20 +1,26 @@ # package metadata %global package_name swiftlang -%global package_version 5.5.3 +%global package_version 5.6.0 %global package_summary The Swift programming language %global package_license Apache 2.0 %global package_url https://www.swift.org # versions -%global swift_version 5.5.3-RELEASE +%global swift_version 5.6-RELEASE %global icu_version 65-1 %global yams_version 4.0.2 -%global swift_argument_parser_version 0.4.3 +%global swift_argument_parser_version 1.0.3 %global swift_crypto_version 1.1.5 %global ninja_version 1.10.2 %global cmake_version 3.19.6 +%global swift_atomics_version 1.0.2 +%global swift_collections_version 1.0.1 +%global swift_numerics_version 1.0.1 +%global swift_system_version 1.1.1 +%global swift_nio_version 2.31.2 +%global swift_nio_ssl_version 2.15.0 # locations From 4cff043001c9d307a18680702405468404476fdb Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Thu, 10 Mar 2022 18:14:27 -0800 Subject: [PATCH 2/3] Update platforms/Linux/RPM/Fedora/34/swiftlang.spec --- platforms/Linux/RPM/Fedora/34/swiftlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/Linux/RPM/Fedora/34/swiftlang.spec b/platforms/Linux/RPM/Fedora/34/swiftlang.spec index a7785c29..cef123eb 100644 --- a/platforms/Linux/RPM/Fedora/34/swiftlang.spec +++ b/platforms/Linux/RPM/Fedora/34/swiftlang.spec @@ -17,7 +17,7 @@ %global swift_nio_ssl_version 2.15.0 Name: swiftlang -Version: 5.6.0 +Version: %{package_version} Release: 1%{?dist} Summary: The Swift programming language License: Apache 2.0 From a321849fee85520dd248795732cc61107617446a Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 11 Mar 2022 09:18:22 -0600 Subject: [PATCH 3/3] Fixed typo in spec file --- platforms/Linux/RPM/Fedora/35/swiftlang.spec | 2 +- platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/Linux/RPM/Fedora/35/swiftlang.spec b/platforms/Linux/RPM/Fedora/35/swiftlang.spec index bcfbce2e..0d088442 100644 --- a/platforms/Linux/RPM/Fedora/35/swiftlang.spec +++ b/platforms/Linux/RPM/Fedora/35/swiftlang.spec @@ -18,7 +18,7 @@ %global swift_nio_ssl_version 2.15.0 Name: swiftlang -Version: ${package_version} +Version: %{package_version} Release: 1%{?dist} Summary: The Swift programming language License: Apache 2.0 diff --git a/platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec b/platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec index 81389bc3..2d03b952 100644 --- a/platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec +++ b/platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec @@ -18,7 +18,7 @@ %global swift_nio_ssl_version 2.15.0 Name: swiftlang -Version: ${package_version} +Version: %{package_version} Release: 1%{?dist} Summary: The Swift programming language License: Apache 2.0