diff --git a/.cvsignore b/.cvsignore index d4a2629..24a0686 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz wine-0.9.10-fe.tar.bz2 diff --git a/sources b/sources index 56cc20b..496fe7a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz 054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 diff --git a/wine-20050524-generated.patch b/wine-20050524-generated.patch deleted file mode 100644 index 06de588..0000000 --- a/wine-20050524-generated.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: wine/tools/wineprefixcreate.in -=================================================================== -RCS file: /home/wine/wine/tools/wineprefixcreate.in,v -retrieving revision 1.10 -diff -u -r1.10 wineprefixcreate.in ---- wine/tools/wineprefixcreate.in 19 May 2005 11:12:34 -0000 1.10 -+++ wine/tools/wineprefixcreate.in 29 May 2005 00:00:00 -0000 -@@ -38,6 +38,7 @@ - - dlldir="@dlldir@" - datadir="@datadir@/wine" -+fontdir="@datadir@/fonts/wine" - - do_wait=0 - quiet=0 -@@ -175,6 +176,11 @@ - link_app winhelp "$CROOT/windows/winhelp.exe" - link_app winhelp "$CROOT/windows/winhlp32.exe" - link_app winebrowser "$CROOT/windows/winebrowser.exe" -+ -+# Copy the generated fonts -+ -+cp $fontdir/*.ttf "$CROOT/windows/fonts" -+cp $fontdir/*.fon "$CROOT/windows/fonts" - - # Copy the .inf script and run it - diff --git a/wine.spec b/wine.spec index 486fe62..ddacc30 100644 --- a/wine.spec +++ b/wine.spec @@ -11,7 +11,6 @@ URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -21,7 +20,6 @@ Source103: wine-winecfg.desktop Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -158,8 +156,6 @@ with the Wine Windows(TM) emulation libraries. %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" @@ -193,10 +189,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/wine mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -550,48 +542,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -696,6 +647,11 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/*.def %changelog +* Thu Mar 16 2006 Andreas Bierfert +0.9.10-1 +- version upgrade +- drop ancient extra fonts + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade