From 6e96a1ceaf3a30f3a8c3d24a6d456673a714b059 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Aug 16 2014 03:30:42 +0000 Subject: 1.7.24-1 - version upgrade - No longer install Wine fonts into system directory (rhbz#1039763) --- diff --git a/.gitignore b/.gitignore index 8a5fe6f..cb8b838 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /wine-1.6.1.tar.bz2.sign /wine-1.6.1.tar.bz2 -/wine-1.7.22.tar.bz2 -/wine-1.7.22.tar.bz2.sign -/wine-compholio-1.7.22.tar.gz +/wine-1.7.24.tar.bz2 +/wine-1.7.24.tar.bz2.sign +/wine-compholio-1.7.24.tar.gz diff --git a/sources b/sources index 8396a58..d25508f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -519319364b0845ffcbeade4a5b98c0d4 wine-1.7.22.tar.bz2 -549fdcc146646582e5422e370e95ee7f wine-1.7.22.tar.bz2.sign -fa9f6012ec3c2ce9162fb40dd6a063c2 wine-compholio-1.7.22.tar.gz +e66e0e8839dcfb562ae52e6a62e923e6 wine-1.7.24.tar.bz2 +7282bbaea010efcbf6676980eb87c890 wine-1.7.24.tar.bz2.sign +aed638d3264ea7faa132ff6722bf3eb0 wine-compholio-1.7.24.tar.gz diff --git a/wine.spec b/wine.spec index 3084221..25df507 100644 --- a/wine.spec +++ b/wine.spec @@ -10,8 +10,8 @@ %endif # 0%{?fedora} Name: wine -Version: 1.7.22 -Release: 4%{?dist} +Version: 1.7.24 +Release: 1%{?dist} Summary: A compatibility layer for windows applications Group: Applications/Emulators @@ -61,7 +61,7 @@ Patch511: wine-cjk.patch # wine compholio patches for pipelight. # pulseaudio-patch is covered by that patch-set, too. %if 0%{?compholio} -Source900: https://github.com/compholio/wine-compholio-daily/archive/v%{version}.tar.gz#/wine-compholio-%{version}.tar.gz +Source900: https://github.com/compholio/wine-compholio/archive/v%{version}.tar.gz#/wine-compholio-%{version}.tar.gz %else # 0%{?compholio} ## winepulse backend # http://repo.or.cz/w/wine/multimedia.git @@ -783,41 +783,13 @@ install -p -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ld.so.conf.d/ %endif -# install fonts -%if 0%{?compholio} -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-arial-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/arial* %{buildroot}/%{_datadir}/fonts/wine-arial-fonts/ -%endif # 0%{?compholio} - -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-courier-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/cou* %{buildroot}/%{_datadir}/fonts/wine-courier-fonts/ - -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-fixedsys-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/*vgafix.fon %{buildroot}/%{_datadir}/fonts/wine-fixedsys-fonts/ - -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-system-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/*sys.* %{buildroot}/%{_datadir}/fonts/wine-system-fonts/ -mv %{buildroot}/%{_datadir}/wine/fonts/vgas*.* %{buildroot}/%{_datadir}/fonts/wine-system-fonts/ - -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-small-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/sma* %{buildroot}/%{_datadir}/fonts/wine-small-fonts/ -mv %{buildroot}/%{_datadir}/wine/fonts/jsma* %{buildroot}/%{_datadir}/fonts/wine-small-fonts/ - -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-marlett-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/marlett.ttf %{buildroot}/%{_datadir}/fonts/wine-marlett-fonts/ - -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-ms-sans-serif-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/sse* %{buildroot}/%{_datadir}/fonts/wine-ms-sans-serif-fonts/ - +# install Tahoma font for system package install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-tahoma-fonts pushd %{buildroot}/%{_datadir}/fonts/wine-tahoma-fonts ln -s ../../wine/fonts/tahoma.ttf tahoma.ttf ln -s ../../wine/fonts/tahomabd.ttf tahomabd.ttf popd -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-symbol-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/symbol.ttf %{buildroot}/%{_datadir}/fonts/wine-symbol-fonts/ - # add config and readme for tahoma install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} @@ -826,9 +798,6 @@ 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 -install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-wingdings-fonts -mv %{buildroot}/%{_datadir}/wine/fonts/wingding.ttf %{buildroot}/%{_datadir}/fonts/wine-wingdings-fonts/ - # clean readme files pushd documentation @@ -1557,32 +1526,46 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %if 0%{?compholio} %files arial-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-arial-fonts +%{_datadir}/wine/fonts/arial* %endif #0%{?compholio} %files courier-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-courier-fonts +%{_datadir}/wine/fonts/cou* %files fixedsys-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-fixedsys-fonts +%{_datadir}/wine/fonts/*vgafix.fon %files system-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-system-fonts +%{_datadir}/wine/fonts/cvgasys.fon +%{_datadir}/wine/fonts/hvgasys.fon +%{_datadir}/wine/fonts/jvgasys.fon +%{_datadir}/wine/fonts/svgasys.fon +%{_datadir}/wine/fonts/vgas1255.fon +%{_datadir}/wine/fonts/vgas1256.fon +%{_datadir}/wine/fonts/vgas1257.fon +%{_datadir}/wine/fonts/vgas874.fon +%{_datadir}/wine/fonts/vgasys.fon +%{_datadir}/wine/fonts/vgasyse.fon +%{_datadir}/wine/fonts/vgasysg.fon +%{_datadir}/wine/fonts/vgasysr.fon +%{_datadir}/wine/fonts/vgasyst.fon %files small-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-small-fonts +%{_datadir}/wine/fonts/sma* +%{_datadir}/wine/fonts/jsma* %files marlett-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-marlett-fonts +%{_datadir}/wine/fonts/marlett.ttf %files ms-sans-serif-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-ms-sans-serif-fonts +%{_datadir}/wine/fonts/sse* +%{_datadir}/wine/fonts/msyh.ttf %files tahoma-fonts %doc COPYING.LIB @@ -1596,11 +1579,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files symbol-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-symbol-fonts +%{_datadir}/wine/fonts/symbol.ttf %files wingdings-fonts %doc COPYING.LIB -%{_datadir}/fonts/wine-wingdings-fonts +%{_datadir}/wine/fonts/wingding.ttf %files desktop %{_datadir}/applications/wine-notepad.desktop @@ -1687,6 +1670,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Aug 15 2014 Michael Cronenworth +- 1.7.24-1 +- version upgrade +- No longer install Wine fonts into system directory (rhbz#1039763) + * Thu Jul 17 2014 Björn Esser - 1.7.22-4 - prevent accidential build with compholio-patchset on EPEL - rebuild for pulseaudio (bug #1117683)