summaryrefslogtreecommitdiffstats
path: root/swift-lang.spec
diff options
context:
space:
mode:
Diffstat (limited to 'swift-lang.spec')
-rw-r--r--swift-lang.spec17
1 files changed, 12 insertions, 5 deletions
diff --git a/swift-lang.spec b/swift-lang.spec
index 5ed57e5..0754f95 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -1,10 +1,10 @@
%global debug_package %{nil}
-%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-06-12-a
-%global swiftgithash bb9532c
-%global swiftgitdate 20180612
+%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-06-23-a
+%global swiftgithash 1e07724
+%global swiftgitdate 20180623
Name: swift-lang
Version: 4.2
-Release: 0.19.%{swiftgitdate}git%{swiftgithash}%{?dist}
+Release: 0.20.%{swiftgitdate}git%{swiftgithash}%{?dist}
Summary: Apple's Swift programming language
License: ASL 2.0
URL: https://swift.org
@@ -24,10 +24,11 @@ Source12: https://github.com/apple/swift-xcode-playground-support/archive/
Source13: swift-lang.conf
-Patch0: %{name}-%{version}-change-lldb-location.patch
+Patch0: change-locations.patch
Patch1: compiler-rt-no-ustat.patch
Patch2: no-ninja-build.patch
Patch3: time-struct-redefined.patch
+Patch4: integration-tests.patch
BuildRequires: which
@@ -105,6 +106,10 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo
# Fixes an error in compiler-rt where the timespec struct is redefined
%patch3 -p0
+# Sets the environment variable SWIFT_BUILD_FOR_FEDORA to tell the tests to use
+# the correct version of clang when testing
+%patch4 -p0
+
%build
export VERBOSE=1
@@ -184,6 +189,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
%postun -p /sbin/ldconfig
%changelog
+* Mon Jun 25 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.20.20180623git1e07724
+- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-23-a
* Wed Jun 13 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.19.20180612gitbb9532c
- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-12-a and removed
gcc-c++ as a build requirement