summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRon Olson <tachoknight@gmail.com>2019-03-28 11:55:44 -0500
committerRon Olson <tachoknight@gmail.com>2019-03-28 11:55:44 -0500
commit806dbd0b700681c6f5b74eaaf4a83ff4272d750b (patch)
tree41a8a77c2098d5f2f66385072be6886a21202697
parent3a38b9c4a2ab0ab7871742d4851e12efab823b9a (diff)
downloadswift-lang-806dbd0b700681c6f5b74eaaf4a83ff4272d750b.tar.gz
swift-lang-806dbd0b700681c6f5b74eaaf4a83ff4272d750b.tar.xz
swift-lang-806dbd0b700681c6f5b74eaaf4a83ff4272d750b.zip
Made some fixes to spec file to handle upgrades to 5.0
-rw-r--r--swift-lang.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/swift-lang.spec b/swift-lang.spec
index 787a9a5..aa72660 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -4,9 +4,10 @@
%global swiftgitdate 20190325
%global swiftbuild swift-source
%global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.*
+
Name: swift-lang
Version: 5.0
-Release: 0.52.%{swiftgitdate}git%{swiftgithash}%{?dist}
+Release: 0.53.%{swiftgitdate}git%{swiftgithash}%{?dist}
Summary: Apple's Swift programming language
License: ASL 2.0
URL: https://swift.org
@@ -67,6 +68,9 @@ Requires: ncurses-devel
Requires: ncurses-compat-libs
Requires: %{name}-runtime = %{version}-%{release}
+Conflicts: %{name} < %{version}-%{release}
+Conflicts: %{name}-runtime < %{version}-%{release}
+
ExclusiveArch: x86_64 aarch64
@@ -223,6 +227,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
%files runtime
+/usr/lib/swift/
/usr/lib/swift/linux/*
%{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf
@@ -232,6 +237,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
%changelog
+* Thu Mar 28 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.53.20190325gitba33f9e
+- Modified spec file to handle upgrades from 4.2 to 5.0.
* Mon Mar 25 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.52.20190325gitba33f9e
- Updated to swift-5.0-RELEASE
* Mon Mar 25 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.51.20190324git130a414
@@ -240,7 +247,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
* Fri Mar 22 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.50.20190310git4d6e741
- The swift-corelibs-xctest library was being zeroed out due to issue with
CMake 3.14 where it was being copied into the same directory. A bug
- report has been filed with CMake but until it's resolved, the cmake file
+ report has been filed with CMake but until it is resolved, the cmake file
has been patched to not perform the copy.
* Fri Mar 15 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.50.20190310git4d6e741
- Modules did not work properly in the REPL due to additional lib path;