diff --git a/wine.spec b/wine.spec index ff6e50c..367cbf0 100644 --- a/wine.spec +++ b/wine.spec @@ -22,7 +22,7 @@ Name: wine Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A compatibility layer for windows applications Group: Applications/Emulators @@ -406,9 +406,12 @@ Requires: wine-system-fonts = %{version}-%{release} Requires: wine-marlett-fonts = %{version}-%{release} Requires: wine-ms-sans-serif-fonts = %{version}-%{release} Requires: wine-tahoma-fonts = %{version}-%{release} +# times-new-roman-fonts are available with compholio-patchset, only. %if 0%{?compholio} Requires: wine-times-new-roman-fonts = %{version}-%{release} -%endif +%else # 0%{?compholio} +Obsoletes: wine-times-new-roman-fonts <= %{version}-%{release} +%endif # 0%{?compholio} Requires: wine-symbol-fonts = %{version}-%{release} Requires: wine-wingdings-fonts = %{version}-%{release} # intermediate fix for #593140 @@ -2167,6 +2170,9 @@ fi %endif %changelog +* Wed Feb 14 2018 Michael Cronenworth 3.1-2 +- fix upgrade path from wine-staging + * Fri Feb 09 2018 Michael Cronenworth 3.1-1 - version update - disable wine-staging