From a2a4f5bfaa45f19d286d13410e34e61146284cd3 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Nov 22 2018 16:58:34 +0000
Subject: Fix requires on subpackages


Use fully versioned requires for subpackage dependencies

---

diff --git a/dotnet.spec b/dotnet.spec
index 3a149c7..88c2714 100644
--- a/dotnet.spec
+++ b/dotnet.spec
@@ -18,12 +18,13 @@
 %global dotnet_cflags %(echo %optflags | sed -e 's/-fcf-protection//' | sed -re 's/-specs=[^ ]*//g')
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
+%global host_version 2.1.6
 %global sdk_version 2.1.500
 %global runtime_version 2.1.6
 
 Name:           dotnet
 Version:        %{sdk_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
@@ -68,7 +69,7 @@ BuildRequires:  compat-openssl10-devel
 BuildRequires:  openssl-devel
 %endif
 
-Requires:       %{name}-sdk-2.1%{?_isa}
+Requires:       %{name}-sdk-2.1%{?_isa} >= %{sdk_version}-%{release}
 
 %description
 .NET Core is a fast, lightweight and modular platform for creating
@@ -83,7 +84,7 @@ application to drive everything.
 
 %package host
 
-Version:        %{runtime_version}
+Version:        %{host_version}
 Summary:        .NET command line launcher
 
 %description host
@@ -98,11 +99,12 @@ applications and micro-services.
 
 %package host-fxr-2.1
 
-Version:        %{runtime_version}
+Version:        %{host_version}
 Summary:        .NET Core command line host resolver
 
-# Theoretically any version of the host should work
-Requires:       %{name}-host%{?_isa}
+# Theoretically any version of the host should work. But lets aim for the one
+# provided by this package, or from a newer version of .NET Core
+Requires:       %{name}-host%{?_isa} >= %{host_version}-%{release}
 
 %description host-fxr-2.1
 The .NET Core host resolver contains the logic to resolve and select
@@ -120,7 +122,7 @@ applications and micro-services.
 Version:        %{runtime_version}
 Summary:        NET Core 2.1 runtime
 
-Requires:       %{name}-host-fxr-2.1%{?_isa}
+Requires:       %{name}-host-fxr-2.1%{?_isa} >= %{host_version}-%{release}
 
 # libicu is dlopen()ed
 Requires:       libicu
@@ -142,7 +144,7 @@ applications and micro-services.
 Version:        %{sdk_version}
 Summary:        .NET Core 2.1 Software Development Kit
 
-Requires:       %{name}-sdk-2.1.5xx%{?_isa}
+Requires:       %{name}-sdk-2.1.5xx%{?_isa} >= %{sdk_version}-%{release}
 
 %description sdk-2.1
 The .NET Core SDK is a collection of command line applications to
@@ -159,7 +161,7 @@ applications and micro-services.
 Version:        %{sdk_version}
 Summary:        .NET Core 2.1.5xx Software Development Kit
 
-Requires:       %{name}-runtime-2.1%{?_isa}
+Requires:       %{name}-runtime-2.1%{?_isa} >= %{runtime_version}-%{release}
 
 %description sdk-2.1.5xx
 The .NET Core SDK is a collection of command line applications to
@@ -245,6 +247,7 @@ echo "Testing build results for debug symbols..."
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/dotnet
 %dir %{_libdir}/%{name}/host
+%dir %{_libdir}/%{name}/host/fxr
 %{_bindir}/dotnet
 %license %{_libdir}/%{name}/LICENSE.txt
 %license %{_libdir}/%{name}/ThirdPartyNotices.txt
@@ -255,7 +258,8 @@ echo "Testing build results for debug symbols..."
 %{_datadir}/bash-completion/completions/dotnet
 
 %files host-fxr-2.1
-%{_libdir}/%{name}/host/fxr
+%dir %{_libdir}/%{name}/host/fxr
+%{_libdir}/%{name}/host/fxr/%{host_version}
 
 %files runtime-2.1
 %dir %{_libdir}/%{name}/shared
@@ -270,6 +274,9 @@ echo "Testing build results for debug symbols..."
 %{_libdir}/%{name}/sdk/%{sdk_version}
 
 %changelog
+* Thu Nov 22 2018 Omair Majid <omajid@redhat.com> - 2.1.500-2
+- Fix requires on subpackages
+
 * Tue Nov 13 2018 Omair Majid <omajid@redhat.com> - 2.1.500-1
 - Update to .NET Core Runtime 2.1.6 and SDK 2.1.500