From 426e70cc47482352bb22de8fa1b8f141c7361752 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Tue, 8 Sep 2015 23:06:44 -0500 Subject: [PATCH] Update to 1.7.51 --- .gitignore | 6 +++--- sources | 6 +++--- wine.spec | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f306e79..fc3c17f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/wine-1.7.50.tar.bz2 -/wine-1.7.50.tar.bz2.sign -/wine-staging-1.7.50.tar.gz +/wine-1.7.51.tar.bz2 +/wine-1.7.51.tar.bz2.sign +/wine-staging-1.7.51.tar.gz diff --git a/sources b/sources index 18935ce..3feeae9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -c8b30bf13c3d418688fd6fa1321edb8a wine-1.7.50.tar.bz2 -e5fbff1f79483b3ec55cf1b4d545eb45 wine-1.7.50.tar.bz2.sign -09bb58240bdf89481a7b27992896685b wine-staging-1.7.50.tar.gz +0bd3707316cd404da6c48c30e07fafb5 wine-1.7.51.tar.bz2 +1f64d173383dabc163b8f3f2ae3d5fe8 wine-1.7.51.tar.bz2.sign +80c3fc0c262b380784990be18a91f260 wine-staging-1.7.51.tar.gz diff --git a/wine.spec b/wine.spec index b6b3f13..898f1aa 100644 --- a/wine.spec +++ b/wine.spec @@ -21,7 +21,7 @@ %endif Name: wine -Version: 1.7.50 +Version: 1.7.51 Release: 1%{?dist} Summary: A compatibility layer for windows applications @@ -392,6 +392,9 @@ 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} +%if 0%{?compholio} +Requires: wine-times-new-roman-fonts = %{version}-%{release} +%endif Requires: wine-symbol-fonts = %{version}-%{release} Requires: wine-wingdings-fonts = %{version}-%{release} # intermediate fix for #593140 @@ -493,6 +496,29 @@ Requires: wine-tahoma-fonts = %{version}-%{release} %description tahoma-fonts-system %{summary} +%if 0%{?compholio} +%package times-new-roman-fonts +Summary: Wine Times New Roman font family +Group: User Interface/X +BuildArch: noarch +Requires: wine-filesystem = %{version}-%{release} + +%description times-new-roman-fonts +%{summary} +Please note: If you want system integration for wine times new roman fonts install the +wine-times-new-roman-fonts-system package. + +%package times-new-roman-fonts-system +Summary: Wine Times New Roman font family system integration +Group: User Interface/X +BuildArch: noarch +Requires: fontpackages-filesystem +Requires: wine-times-new-roman-fonts = %{version}-%{release} + +%description times-new-roman-fonts-system +%{summary} +%endif + %package symbol-fonts Summary: Wine Symbol font family Group: User Interface/X @@ -874,6 +900,14 @@ install -p -m 0644 %{SOURCE501} %{buildroot}%{_fontconfig_templatedir}/20-wine-t ln -s %{_fontconfig_templatedir}/20-wine-tahoma-nobitmaps.conf \ %{buildroot}%{_fontconfig_confdir}/20-wine-tahoma-nobitmaps.conf +%if 0%{?compholio} +# install Times New Roman font for system package +install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-times-new-roman-fonts +pushd %{buildroot}/%{_datadir}/fonts/wine-times-new-roman-fonts +ln -s ../../wine/fonts/times.ttf times.ttf +popd +%endif + # install Wingdings font for system package install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-wingdings-fonts pushd %{buildroot}/%{_datadir}/fonts/wine-wingdings-fonts @@ -1801,6 +1835,15 @@ fi %{_fontconfig_confdir}/20-wine-tahoma*conf %{_fontconfig_templatedir}/20-wine-tahoma*conf +%if 0%{?compholio} +%files times-new-roman-fonts +%doc COPYING.LIB +%{_datadir}/wine/fonts/times.ttf + +%files times-new-roman-fonts-system +%{_datadir}/fonts/wine-times-new-roman-fonts +%endif + %files symbol-fonts %doc COPYING.LIB %{_datadir}/wine/fonts/symbol.ttf @@ -1902,6 +1945,9 @@ fi %{_libdir}/wine/opencl.dll.so %changelog +* Tue Sep 08 2015 Michael Cronenworth 1.7.51-1 +- version upgrade + * Mon Aug 24 2015 Michael Cronenworth 1.7.50-1 - version upgrade