From e6f6fffc9c7ea1b03f174aeb620ec531f309a260 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 29 Mar 2019 13:09:30 -0500 Subject: Still trying to get upgrading to work --- swift-lang.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 3bbd2fd..13fb594 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -68,10 +68,10 @@ Requires: ncurses-devel Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} -Conflicts: %{name} < %{version} -Conflicts: %{name}-runtime < %{version} +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +#Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name}-runtime < %{version}-%{release} ExclusiveArch: x86_64 aarch64 @@ -91,10 +91,10 @@ 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} +Provides: %{name}-runtime = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name}-runtime < %{version}-%{release} %description runtime @@ -214,6 +214,7 @@ 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/ @@ -229,6 +230,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %files runtime +#/usr/lib/swift/ /usr/lib/swift/linux/libBlocksRuntime.so /usr/lib/swift/linux/libdispatch.so /usr/lib/swift/linux/libFoundation.so -- cgit