From dbc264afe56f12113a29b56c24222279468037b6 Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah@apple.com>
Date: Sun, 27 Feb 2022 21:38:28 -0800
Subject: [PATCH 1/2] Add support for Swift version in the dir, and bump the
 version to Swift 5.5.3

---
 .../Linux/RPM/Amazonlinux/2/swiftlang.spec      | 10 +++++-----
 platforms/Linux/RPM/Centos/7/swiftlang.spec     | 10 +++++-----
 platforms/Linux/RPM/Centos/8/swiftlang.spec     | 10 +++++-----
 platforms/Linux/RPM/Fedora/34/swiftlang.spec    | 17 +++++++++--------
 platforms/Linux/RPM/Fedora/35/swiftlang.spec    | 17 +++++++++--------
 platforms/Linux/RPM/metadata.inc                |  4 ++--
 6 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec b/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec
index f6f5fc43..704c61ba 100644
--- a/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec
+++ b/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec
@@ -135,12 +135,12 @@ export VERBOSE=1
 swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-amazonlinux2.tar.gz
 
 %install
-mkdir -p %{buildroot}%{_libexecdir}/swift/
-cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
+mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
+cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
 mkdir -p %{buildroot}%{_bindir}
-ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift
-ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
-ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
 mkdir -p %{buildroot}%{_mandir}/man1
 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
 
diff --git a/platforms/Linux/RPM/Centos/7/swiftlang.spec b/platforms/Linux/RPM/Centos/7/swiftlang.spec
index 4c4cd466..87cd25ec 100644
--- a/platforms/Linux/RPM/Centos/7/swiftlang.spec
+++ b/platforms/Linux/RPM/Centos/7/swiftlang.spec
@@ -135,12 +135,12 @@ export VERBOSE=1
 swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos7.tar.gz
 
 %install
-mkdir -p %{buildroot}%{_libexecdir}/swift/
-cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
+mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
+cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
 mkdir -p %{buildroot}%{_bindir}
-ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift
-ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
-ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
 mkdir -p %{buildroot}%{_mandir}/man1
 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
 
diff --git a/platforms/Linux/RPM/Centos/8/swiftlang.spec b/platforms/Linux/RPM/Centos/8/swiftlang.spec
index 78fc7608..ea2f48dd 100644
--- a/platforms/Linux/RPM/Centos/8/swiftlang.spec
+++ b/platforms/Linux/RPM/Centos/8/swiftlang.spec
@@ -137,12 +137,12 @@ export VERBOSE=1
 swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos8.tar.gz
 
 %install
-mkdir -p %{buildroot}%{_libexecdir}/swift/
-cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
+mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
+cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
 mkdir -p %{buildroot}%{_bindir}
-ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift
-ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
-ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
 mkdir -p %{buildroot}%{_mandir}/man1
 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
 
diff --git a/platforms/Linux/RPM/Fedora/34/swiftlang.spec b/platforms/Linux/RPM/Fedora/34/swiftlang.spec
index c6442e0d..7e983e00 100644
--- a/platforms/Linux/RPM/Fedora/34/swiftlang.spec
+++ b/platforms/Linux/RPM/Fedora/34/swiftlang.spec
@@ -1,18 +1,19 @@
 %global debug_package %{nil}
 %global linux_version fedora
-%global swifttag 5.5.2-RELEASE
+%global swifttag 5.5.3-RELEASE
 %global swiftbuild swift-source
 %global icu_version 65-1
 %global yams_version 4.0.2
 %global sap_version 0.4.3
 %global swift_crypto_version 1.1.5
 %global ninja_version 1.10.2
+%global package_version 5.5.3
 
 Name:           swiftlang
-Version:        5.5.2
+Version:        5.5.3
 Release:        1%{?dist}
 Summary:        Apple's Swift programming language
-License:        ASL 2.0 and Unicode
+License:        Apache 2.0
 URL:            https://swift.org
 
 Source0:        https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz
@@ -142,12 +143,12 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil
 
 
 %install
-mkdir -p %{buildroot}%{_libexecdir}/swift/
-cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
+mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
+cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
 mkdir -p %{buildroot}%{_bindir}
-ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift 
-ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
-ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
 mkdir -p %{buildroot}%{_mandir}/man1
 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
 
diff --git a/platforms/Linux/RPM/Fedora/35/swiftlang.spec b/platforms/Linux/RPM/Fedora/35/swiftlang.spec
index c6442e0d..7e983e00 100644
--- a/platforms/Linux/RPM/Fedora/35/swiftlang.spec
+++ b/platforms/Linux/RPM/Fedora/35/swiftlang.spec
@@ -1,18 +1,19 @@
 %global debug_package %{nil}
 %global linux_version fedora
-%global swifttag 5.5.2-RELEASE
+%global swifttag 5.5.3-RELEASE
 %global swiftbuild swift-source
 %global icu_version 65-1
 %global yams_version 4.0.2
 %global sap_version 0.4.3
 %global swift_crypto_version 1.1.5
 %global ninja_version 1.10.2
+%global package_version 5.5.3
 
 Name:           swiftlang
-Version:        5.5.2
+Version:        5.5.3
 Release:        1%{?dist}
 Summary:        Apple's Swift programming language
-License:        ASL 2.0 and Unicode
+License:        Apache 2.0
 URL:            https://swift.org
 
 Source0:        https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz
@@ -142,12 +143,12 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil
 
 
 %install
-mkdir -p %{buildroot}%{_libexecdir}/swift/
-cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
+mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
+cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
 mkdir -p %{buildroot}%{_bindir}
-ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift 
-ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
-ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
+ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
 mkdir -p %{buildroot}%{_mandir}/man1
 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
 
diff --git a/platforms/Linux/RPM/metadata.inc b/platforms/Linux/RPM/metadata.inc
index e15058c8..b6b0fdf8 100644
--- a/platforms/Linux/RPM/metadata.inc
+++ b/platforms/Linux/RPM/metadata.inc
@@ -1,14 +1,14 @@
 # package metadata
 
 %global package_name      swiftlang
-%global package_version   5.5.2
+%global package_version   5.5.3
 %global package_summary   The Swift programming language
 %global package_license   Apache 2.0
 %global package_url       https://swift.org
 
 # versions
 
-%global swift_version 5.5.2-RELEASE
+%global swift_version 5.5.3-RELEASE
 %global icu_version 65-1
 %global yams_version 4.0.2
 %global swift_argument_parser_version 0.4.3

From fa621527298dc362e4aad6a42607d6c57350abd7 Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah@apple.com>
Date: Sun, 27 Feb 2022 21:40:59 -0800
Subject: [PATCH 2/2] Update the url and summary

---
 platforms/Linux/RPM/Fedora/34/swiftlang.spec | 4 ++--
 platforms/Linux/RPM/Fedora/35/swiftlang.spec | 4 ++--
 platforms/Linux/RPM/metadata.inc             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platforms/Linux/RPM/Fedora/34/swiftlang.spec b/platforms/Linux/RPM/Fedora/34/swiftlang.spec
index 7e983e00..ee81de1d 100644
--- a/platforms/Linux/RPM/Fedora/34/swiftlang.spec
+++ b/platforms/Linux/RPM/Fedora/34/swiftlang.spec
@@ -12,9 +12,9 @@
 Name:           swiftlang
 Version:        5.5.3
 Release:        1%{?dist}
-Summary:        Apple's Swift programming language
+Summary:        The Swift programming language
 License:        Apache 2.0
-URL:            https://swift.org
+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
diff --git a/platforms/Linux/RPM/Fedora/35/swiftlang.spec b/platforms/Linux/RPM/Fedora/35/swiftlang.spec
index 7e983e00..ee81de1d 100644
--- a/platforms/Linux/RPM/Fedora/35/swiftlang.spec
+++ b/platforms/Linux/RPM/Fedora/35/swiftlang.spec
@@ -12,9 +12,9 @@
 Name:           swiftlang
 Version:        5.5.3
 Release:        1%{?dist}
-Summary:        Apple's Swift programming language
+Summary:        The Swift programming language
 License:        Apache 2.0
-URL:            https://swift.org
+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
diff --git a/platforms/Linux/RPM/metadata.inc b/platforms/Linux/RPM/metadata.inc
index b6b0fdf8..f8fb223a 100644
--- a/platforms/Linux/RPM/metadata.inc
+++ b/platforms/Linux/RPM/metadata.inc
@@ -4,7 +4,7 @@
 %global package_version   5.5.3
 %global package_summary   The Swift programming language
 %global package_license   Apache 2.0
-%global package_url       https://swift.org
+%global package_url       https://www.swift.org
 
 # versions