summaryrefslogtreecommitdiffstats
path: root/swift-lang.spec
diff options
context:
space:
mode:
authorRon Olson <tachoknight@gmail.com>2019-03-28 21:44:30 -0500
committerRon Olson <tachoknight@gmail.com>2019-03-28 21:44:30 -0500
commit8e64c35c889b18ab844dba1582ec53121a214b28 (patch)
tree12277450501262ed3805ea8058f37de81c4478f6 /swift-lang.spec
parent806dbd0b700681c6f5b74eaaf4a83ff4272d750b (diff)
downloadswift-lang-8e64c35c889b18ab844dba1582ec53121a214b28.tar.gz
swift-lang-8e64c35c889b18ab844dba1582ec53121a214b28.tar.xz
swift-lang-8e64c35c889b18ab844dba1582ec53121a214b28.zip
Couple additional changes to make upgrading work
Diffstat (limited to 'swift-lang.spec')
-rw-r--r--swift-lang.spec35
1 files changed, 25 insertions, 10 deletions
diff --git a/swift-lang.spec b/swift-lang.spec
index aa72660..3bbd2fd 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -68,8 +68,10 @@ Requires: ncurses-devel
Requires: ncurses-compat-libs
Requires: %{name}-runtime = %{version}-%{release}
-Conflicts: %{name} < %{version}-%{release}
-Conflicts: %{name}-runtime < %{version}-%{release}
+Provides: %{name} = %{version}
+Obsoletes: %{name} < %{version}
+Conflicts: %{name} < %{version}
+Conflicts: %{name}-runtime < %{version}
ExclusiveArch: x86_64 aarch64
@@ -89,6 +91,12 @@ correct programs easier for the developer.
%package runtime
Summary: Runtime files for Swift programs
+Provides: %{name}-runtime = %{version}
+Obsoletes: %{name} < %{version}
+Conflicts: %{name} < %{version}
+Conflicts: %{name}-runtime < %{version}
+
+
%description runtime
Runtime libraries for Swift programs
@@ -206,7 +214,6 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
%license swift/LICENSE.txt
%{_bindir}/swift*
%{_mandir}/man1/*
-/usr/lib/swift/
/usr/lib/swift-lldb/
/usr/lib/swift/Block/
/usr/lib/swift/CoreFoundation/
@@ -216,19 +223,27 @@ 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/libBlocksRuntime.so
+/usr/lib/swift/linux/libdispatch.so
+/usr/lib/swift/linux/libFoundation.so
+/usr/lib/swift/linux/libswiftCore.so
+/usr/lib/swift/linux/libswiftDispatch.so
+/usr/lib/swift/linux/libswiftGlibc.so
+/usr/lib/swift/linux/libswiftRemoteMirror.so
+/usr/lib/swift/linux/libswiftSIMDOperators.so
+/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so
+/usr/lib/swift/linux/libXCTest.so
+%ifarch aarch64
+/usr/lib/swift/linux/aarch64/*
+%else
+/usr/lib/swift/linux/x86_64/*
+%endif
%{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf