The package rpms/swift-lang.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/swift-lang.git/commit/?id=09a193b....
Change:
+ExclusiveArch: x86_64 aarch64
Thanks.
Full change:
============
commit 09a193b388f5479e4cf81fbf5846e54aa340a06b
Author: Ron Olson <tachoknight(a)gmail.com>
Date: Fri May 1 09:15:49 2020 -0500
Updated to Swift 5.2.3-RELEASE
diff --git a/sources b/sources
index 83b7d0a..7bbd88b 100644
--- a/sources
+++ b/sources
@@ -1,15 +1,15 @@
SHA512 (cmake-3.16.5.tar.gz) =
204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
-SHA512 (cmark.tar.gz) =
b7b53691557a672cc14b502071340c2c4cf53440ec89c08148f4f72d13d8907eae28b4c56258cbac6ad04b649cc6ac687be97972e17176d41c959de831d05ebc
-SHA512 (corelibs-foundation.tar.gz) =
8eb47ef48f8638ad13b86baf645da2e5466efe4a076516bf85cb7dc972a3861619b3d4600e2cd07add0fb1a1aaa50d451b41ced7af0e7fcbcfeb4cb7b95afefd
-SHA512 (corelibs-libdispatch.tar.gz) =
fdb9f511e5ae5db740c8d590d41c57ca79bd7e638e8655ce5c597149d4b146571abf63ece748920020564bf8414455e3232822585274d49ad05107c93e5dd1ac
-SHA512 (corelibs-xctest.tar.gz) =
14fa70d983a92de8681148284b949fdadd4c31f0dc216c3b5a0620e47e9029a656527a06cd88afc7b9f122dca013b06faf218fa9cde0669023c648f18ef923b5
-SHA512 (indexstore-db.tar.gz) =
9abb756171b59e116f824bda8a993582d4cf3ce84d418b33731a4da43f116fbc862ce5a40de1288febd993093c1a9cd364b15a2e281ce2858f660f74caefb599
-SHA512 (llbuild.tar.gz) =
2ae4f37a727da560cf701f5ad5f74210e0c7e96e23a5400ae1d680765966ed71ef0300819e936a7cd555427c49979b34010ccb7b6aa7c5d849b7e6b5bfbd57d1
-SHA512 (llvm-project.tar.gz) =
8c7fd5b69c741c2489ba6875da8b5acd77154acc4277abfdaf9aa9bfc69ab2a0b1e29fec9d152355eefbe63662067bd26e404432eff2953f9868b8e78bad67d1
-SHA512 (package-manager.tar.gz) =
9c48ae393782457c7149454258f8c72700a3117d43e680a8576c924b271993d76e538c3b020350ee6f9459cc2e5dcdc713224a0de1eec42822f87966a36b2dff
+SHA512 (cmark.tar.gz) =
8625514a7146599c03f7c72e8618de872d4ff6c36d5674944e6f4e622a6e8445e5de0f5eac144dfe76b25da43265e9d69faa768308ff82193217d4d00fb0aebe
+SHA512 (corelibs-foundation.tar.gz) =
50bdc837f07256b3163b6a6df4c4c47980f8d73fd99c455dc92061ea6e881b6dffefea4398d5ccce4c56e8a4bbebf52b43000dda4923d9f2e7213fc2bf2a853a
+SHA512 (corelibs-libdispatch.tar.gz) =
33c46249d39153d7af814fabb7c3ccffb1d52b0b7997822ca8667c899c593bb89397a79b0c71820d57a62ff04afa4891141c59eadea4ec6d8e58b57f32b6828f
+SHA512 (corelibs-xctest.tar.gz) =
31e15ab31ebbf0203072bf7e7ef2a9e3a4fe4273ee840eeb71bdc7434bfbc4f36fbc768125967cd50249b406842118eff80dfefc3b1021e7bcd3fb3eff978922
+SHA512 (indexstore-db.tar.gz) =
25b07bad32aae1731ab928c2796177a1304373d872fe467bd2b6583142b17233456302ec465cf017c96d01826b62c09dcb70dfb853c92e251f893df4fa316bb3
+SHA512 (llbuild.tar.gz) =
a2ad5adf8455903b1e1e0493f2d5e9f353b3f5bec4aef923991a1d558c7cae38837216d71f91a329b18b21a99444e98c73e93b3445868e38559aba071f517fa5
+SHA512 (llvm-project.tar.gz) =
14395c3d3ceb36581c22c056b82f4b85293d2523ca54c6b4e4d2797d847b369917218f2f317b198eaa4fe18106439f37567ee9303307b7095b14433c6d81e46c
+SHA512 (package-manager.tar.gz) =
6b4d865ec75725def0b065012dc5302d27a5f8e32452047fcada79bb92cfbdc2af5d5e47979bedf466461a3c26b55f5a093e81b92289024e5ecdcdbcc9184c78
SHA512 (release-61-2.tar.gz) =
9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2
-SHA512 (sourcekit-lsp.tar.gz) =
c035f03e42b0e5fed051608c2e0b161e671d8cde20b1de36a28596209a98a67b6e9236170c375920c600d7db4382b7a1419632a8b307f41671f3a4c303a7dd04
-SHA512 (swift-integration-tests.tar.gz) =
04970d0037f747f921d94f4b767a8a30b4fd6432bdd9bf8490f096dc58076dc9995934fde43442bfef7f5d7f0316ab488af994f330d9d1803d79fca6c55bffa7
-SHA512 (swift-syntax.tar.gz) =
b4a81c290a194473d86dc42811a3ebce483f76f785a4423ab3d80b4bedc67230f2688bb141b8860bc11a6ecda537c1b5559d341d2445cff05a315e069a53c50d
-SHA512 (swift-xcode-playground-support.tar.gz) =
95181915c8c55eb7cf6442feb9e750a641f820598510b118d4199ad6ec4208a554078dd00585f6b549a8cecf76d020c785e591d6fd4ea6b250fe1aa74ef7940f
-SHA512 (swift.tar.gz) =
d1c178c00a47aa13679ba3ef2d11d0c7f2846fb1320ae6672e715deb0f3bf0d0977955cc01f0dee417d4d72b00c9026b3dbae5fd62e48dc3edcaf0dde65ca8c6
+SHA512 (sourcekit-lsp.tar.gz) =
29c3c92ac95820732e6a92005ae30075f25db77c8bfe301b589d5966ae49302ad3ab6aa6c3b0c97ed5c05f789d2b557d238145e83e4fe9207cd6bab3c1568dae
+SHA512 (swift-integration-tests.tar.gz) =
09b3400b2fc269637a77a8a6fc1c5ac0953f5392fd218f24ce0a87fb59bdd881dff100ffb098aeed663d53c699ba8d00b35e925e6af948ef3d4d15a141ea4a28
+SHA512 (swift-syntax.tar.gz) =
ca535e981357f0dfc005f1ad1e9db169e5a3704fe94e88008f73c91312ea35911bb1de70965576b0cbb241cce28dd389fbecc7c9027991bfb14cd5bcd0dba62f
+SHA512 (swift-xcode-playground-support.tar.gz) =
426e4c224b1554690d34d10768759237cd90ebf1c1b149620cd1527d659e693f069d713da4070cdd1bd153d5dbafbec1a3e5a46e14042043b53a23ac9a9d3ca9
+SHA512 (swift.tar.gz) =
7cda51b628fb2328b869c8cc025fe4b7a0a4b1231bf55503d9e45215f2dc2808951a70c1383bd78bab4a7b24b34fcd382398f5585180c5b8798a1fa878e84f0a
diff --git a/swift-lang.spec b/swift-lang.spec
index e0e71b4..079aa25 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -1,13 +1,13 @@
%global debug_package %{nil}
-%global swifttag 5.2.2-RELEASE
+%global swifttag 5.2.3-RELEASE
# Swift syntax seems to only be updated on major releases
-%global swiftsyntax 5.2.2-RELEASE
+%global swiftsyntax 5.2.3-RELEASE
%global swiftbuild swift-source
%global cmake_version 3.16.5
Name: swift-lang
-Version: 5.2.2
-Release: 2%{?dist}
+Version: 5.2.3
+Release: 1%{?dist}
Summary: Apple's Swift programming language
License: ASL 2.0 and Unicode
URL:
https://swift.org
@@ -75,7 +75,7 @@ Provides: %{name} = %{version}-%{release}
Obsoletes: %{name} < %{version}-%{release}
Obsoletes: %{name}-runtime < %{version}-%{release}
-ExclusiveArch: x86_64 aarch64 s390x
+ExclusiveArch: x86_64 aarch64
%description
@@ -200,6 +200,8 @@ cp %{_builddir}/usr/share/man/man1/swift.1
%{buildroot}%{_mandir}/man1/swift.1
%changelog
+* Wed Apr 29 2020 Ron Olson <tachoknight(a)gmail.com> 5.2.3-1
+- Updated to swift-5.2.3-RELEASE
* Fri Apr 17 2020 Ron Olson <tachoknight(a)gmail.com> 5.2.2-2
- Added patch to remove use of sys/sysctl.h as it was removed
in Rawhide (future F33)
commit 26887eeca3523db6a4644be38859fdc74300cd17
Author: Ron Olson <tachoknight(a)gmail.com>
Date: Sat Apr 18 14:50:32 2020 -0500
Fixed sysctl patch ... again
diff --git a/nosysctl.patch b/nosysctl.patch
index 59151c5..ce4546c 100644
--- a/nosysctl.patch
+++ b/nosysctl.patch
@@ -18,7 +18,7 @@ diff -Naur
swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle
#if TARGET_OS_MAC || TARGET_OS_LINUX
#include <unistd.h>
-#if !TARGET_OS_ANDROID
-+#if TARGET_OS_MAC || TARGET_OS_LINUX
++#if TARGET_OS_MAC || TARGET_OS_BSD
#include <sys/sysctl.h>
#endif
#include <sys/stat.h>
commit fc2fe0edad81ce90aff5ef4eef1b26e3104e5645
Author: Ron Olson <tachoknight(a)gmail.com>
Date: Sat Apr 18 13:07:16 2020 -0500
Fixed sysctl patch
diff --git a/nosysctl.patch b/nosysctl.patch
index fec77d6..59151c5 100644
--- a/nosysctl.patch
+++ b/nosysctl.patch
@@ -1,12 +1,24 @@
----
./swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c.orig 2020-04-16
18:45:49.133260989 -0500
-+++
./swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-16
18:46:21.547420799 -0500
-@@ -17,9 +17,6 @@
+diff -Naur
swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c
swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c
+---
swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-03-18
02:25:12.000000000 -0500
++++
swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-18
12:54:00.130921751 -0500
+@@ -17,7 +17,7 @@
#if (TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD) && !TARGET_OS_CYGWIN
#include <dirent.h>
-#if !TARGET_OS_ANDROID
--#include <sys/sysctl.h>
--#endif
- #include <sys/mman.h>
++#if TARGET_OS_MAC || TARGET_OS_BSD
+ #include <sys/sysctl.h>
#endif
+ #include <sys/mman.h>
+diff -Naur
swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c
swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c
+---
swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-03-18
02:25:12.000000000 -0500
++++
swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-18
12:53:44.299349245 -0500
+@@ -27,7 +27,7 @@
+ #if TARGET_OS_MAC || TARGET_OS_LINUX
+ #include <unistd.h>
+-#if !TARGET_OS_ANDROID
++#if TARGET_OS_MAC || TARGET_OS_LINUX
+ #include <sys/sysctl.h>
+ #endif
+ #include <sys/stat.h>
commit ce5bdc54cc86c7ee99b1020789b6a203475ef447
Author: Ron Olson <tachoknight(a)gmail.com>
Date: Sat Apr 18 07:47:24 2020 -0500
Added patch to handle sysctl.h being removed
diff --git a/nosysctl.patch b/nosysctl.patch
new file mode 100644
index 0000000..fec77d6
--- /dev/null
+++ b/nosysctl.patch
@@ -0,0 +1,12 @@
+---
./swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c.orig 2020-04-16
18:45:49.133260989 -0500
++++
./swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-16
18:46:21.547420799 -0500
+@@ -17,9 +17,6 @@
+
+ #if (TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD) && !TARGET_OS_CYGWIN
+ #include <dirent.h>
+-#if !TARGET_OS_ANDROID
+-#include <sys/sysctl.h>
+-#endif
+ #include <sys/mman.h>
+ #endif
+
diff --git a/swift-lang.spec b/swift-lang.spec
index 72688aa..e0e71b4 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -7,7 +7,7 @@
Name: swift-lang
Version: 5.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apple's Swift programming language
License: ASL 2.0 and Unicode
URL:
https://swift.org
@@ -37,6 +37,7 @@ Patch6: llvm.patch
Patch7: indexstore.patch
Patch8: build-setup-s390x.patch
Patch9: ibm-identifier.patch
+Patch10: nosysctl.patch
BuildRequires: clang
BuildRequires: swig
@@ -154,6 +155,9 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax
%patch9 -p0
%endif
+# sys/sysctl.h has been removed
+%patch10 -p0
+
# Fix python to python3
pathfix.py -pni "%{__python3} %{py3_shbang_opts}"
swift/utils/api_checker/swift-api-checker.py
@@ -196,6 +200,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1
%{buildroot}%{_mandir}/man1/swift.1
%changelog
+* Fri Apr 17 2020 Ron Olson <tachoknight(a)gmail.com> 5.2.2-2
+- Added patch to remove use of sys/sysctl.h as it was removed
+ in Rawhide (future F33)
* Wed Apr 15 2020 Ron Olson <tachoknight(a)gmail.com> 5.2.2-1
- Updated to swift-5.2.2-RELEASE
* Sun Apr 12 2020 Ron Olson <tachoknight(a)gmail.com> 5.2.1-3