Updated to working Swift 5

1 files changed, 76 insertions, 12 deletions

diff --git a/swift-lang.spec b/swift-lang.spec
index f86ef26..c733d63 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -1,12 +1,12 @@
 %global debug_package %{nil}
-%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-15-a
-%global swiftgithash 739169d
-%global swiftgitdate 20181115
+%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-02-06-a
+%global swiftgithash d07c25a
+%global swiftgitdate 20190206
 %global swiftbuild swift-source
 %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.*
 Name:		swift-lang
 Version:        5.0
-Release:        0.1.%{swiftgitdate}git%{swiftgithash}%{?dist}
+Release:        0.32.%{swiftgitdate}git%{swiftgithash}%{?dist}
 Summary:        Apple's Swift programming language
 License:        ASL 2.0
 URL:            https://swift.org
@@ -24,10 +24,11 @@ Source10:       https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}
 Source11:       https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz
 Source12:       https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz
 Source13:       swift-lang.conf
-Source14:	swift-lang-runtime.conf
+Source14:	    swift-lang-runtime.conf
 
-Patch0:     change-lldb-location.patch
-Patch1:		no-ninja-build.patch
+Patch0:     	change-lldb-location.patch
+Patch1:		    no-ninja-build.patch
+Patch2:		    clangloc.patch
 
 BuildRequires:  clang
 BuildRequires:  cmake
@@ -54,9 +55,11 @@ BuildRequires:  ninja-build
 
 Requires:       glibc-devel
 Requires:       clang
-Requires:	%{name}-runtime = %{version}-%{release}
+Requires:	    ncurses-devel
+Requires:	    ncurses-compat-libs
+Requires:	    %{name}-runtime = %{version}-%{release}
 
-ExclusiveArch: 	x86_64
+ExclusiveArch: 	x86_64 aarch64
 
 
 %description
@@ -106,6 +109,9 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo
 # Since we require ninja for building, there's no sense to rebuild it just for Swift
 %patch1 -p0
 
+# This changes the location of where the headers and libs are to keep lldb happy
+%patch2 -p0
+
 
 %build
 export VERBOSE=1
@@ -151,6 +157,11 @@ ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift
 mkdir -p %{buildroot}/usr/lib/swift
 cp -r %{_builddir}/usr/lib/swift/* %{buildroot}/usr/lib/swift
 ln -fs /usr/lib/swift %{buildroot}/usr/lib/swift-lldb/swift
+chmod 0755 %{buildroot}/usr/lib/swift/linux/libswiftDispatch.so
+chmod 0755 %{buildroot}/usr/lib/swift/linux/libFoundation.so
+chmod 0755 %{buildroot}/usr/lib/swift/linux/libXCTest.so
+chmod 0755 %{buildroot}/usr/lib/swift/pm/llbuild/libllbuild.so
+chmod 0755 %{buildroot}/usr/lib/swift/pm/llbuild/libllbuildSwift.so
 
 mkdir -p %{buildroot}/usr/lib/swift_static
 cp -r %{_builddir}/usr/lib/swift_static/* %{buildroot}/usr/lib/swift_static
@@ -177,15 +188,18 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
 /usr/lib/swift/os/
 /usr/lib/swift/pm/
 /usr/lib/swift/shims/
+%ifarch aarch64
+/usr/lib/swift/linux/aarch64/
+%else
 /usr/lib/swift/linux/x86_64/
+%endif
 /usr/lib/swift_static/
 %{_libexecdir}/swift-lldb/
 %{_sysconfdir}/ld.so.conf.d/swift-lang.conf
 
 
 %files runtime
-/usr/lib/swift/
-/usr/lib/swift/linux/
+/usr/lib/swift/linux/*
 %{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf
 
 
@@ -194,7 +208,57 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
 
 
 %changelog
-* Fri Nov 16 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.1.20181115git739169d
+* Fri Feb 08 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.32.20190206gitd07c25a
+- Added patch to allow the Swift REPL to work properly, also removed patch
+  for aarch64 because the changes were merged upstream
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-0.31.20181214gitee39236
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Sat Dec 15 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.31.20181212gite231ae1
+- First version that supports aarch64
+* Thu Dec 13 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.31.20181212gite231ae1
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a
+* Thu Dec 13 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.30.20181212gite231ae1
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a
+* Thu Dec 13 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.29.20181212gite231ae1
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a
+* Tue Dec 11 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.28.20181210gitf83ec0c
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a
+* Mon Dec 10 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.26.20181209gitc14e1a3
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-09-a
+* Sun Dec 09 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.25.20181208git3945260
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-08-a
+* Sat Dec 08 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.24.20181207git0a73e15
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-07-a
+* Fri Dec 07 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.23.20181206git565e767
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-06-a
+* Wed Dec 05 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.22.20181204gitb74d54a
+- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-04-a
+* Wed Dec 05 2018 Egor Zhdan <egor.zhdan@gmail.com>            
+- Include dependencies to ncurses which are required by SourceKit and 
+  included in Apple installation guide
+* Wed Dec 05 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.21.20181204gitfacaad1
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-04-a
+* Tue Dec 04 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.20.20181203git3376f9f
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-03-a
+* Mon Dec 03 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.19.20181202gita8a8bdc
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-02-a
+* Sun Dec 02 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.18.20181201gitb01ee72
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-01-a
+* Sat Dec 01 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.17.20181130gitd8f12cb
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-30-a
+* Thu Nov 29 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.16.20181128git806cf57
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-28-a
+* Tue Nov 27 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.15.20181126gita820992
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-26-a
+* Mon Nov 26 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.14.20181125gita820992
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-25-a
+* Sat Nov 24 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.13.20181123gita820992
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-23-a
+* Fri Nov 23 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.12.20181122gitfb52a2e
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-22-a
+* Mon Nov 19 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.11.20181116git201dcba
+- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-16-a
+* Fri Nov 16 2018 Ron Olson <tachoknight@gmail.com> 5.0-0.10.20181115git739169d
 - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-15-a
 * Wed Oct 31 2018 Ron Olson <tachoknight@gmail.com> 4.2.1-0.101.20181030git02a6ca9
 - Updated to swift-4.2.1-RELEASE