rpms/wine/F-13 .cvsignore, 1.91, 1.92 sources, 1.92, 1.93 wine-fonts.patch, 1.1, 1.2 wine.spec, 1.128, 1.129
Andreas Bierfert
awjb at fedoraproject.org
Fri Jul 16 19:58:04 UTC 2010
- Previous message: rpms/wine/F-12 .cvsignore, 1.93, 1.94 sources, 1.94, 1.95 wine-fonts.patch, 1.1, 1.2 wine.spec, 1.131, 1.132
- Next message: rpms/wine/devel .cvsignore, 1.91, 1.92 sources, 1.92, 1.93 wine-fonts.patch, 1.1, 1.2 wine.spec, 1.129, 1.130
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15374/F-13
Modified Files:
.cvsignore sources wine-fonts.patch wine.spec
Log Message:
- 1.2 final
- improve fonts patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-13/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- .cvsignore 12 Jul 2010 15:41:43 -0000 1.91
+++ .cvsignore 16 Jul 2010 19:58:03 -0000 1.92
@@ -1 +1 @@
-wine-1.2-rc7.tar.bz2
+wine-1.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-13/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources 12 Jul 2010 15:41:43 -0000 1.92
+++ sources 16 Jul 2010 19:58:03 -0000 1.93
@@ -1 +1 @@
-05cc63418e603f3d689bcaa7c7768d01 wine-1.2-rc7.tar.bz2
+eb4e5423b277fc1e77807b04f366f7b7 wine-1.2.tar.bz2
wine-fonts.patch:
dlls/gdi32/freetype.c | 47 +++++++++++++++++++++++++----------------------
tools/wine.inf.in | 3 ++-
2 files changed, 27 insertions(+), 23 deletions(-)
Index: wine-fonts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-13/wine-fonts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- wine-fonts.patch 31 May 2010 13:17:48 -0000 1.1
+++ wine-fonts.patch 16 Jul 2010 19:58:03 -0000 1.2
@@ -1,5 +1,23 @@
+--- tools/wine.inf.in.orig 2010-05-26 07:41:44.000000000 +0200
++++ tools/wine.inf.in 2010-05-26 07:46:15.000000000 +0200
+@@ -576,13 +576,14 @@
+ HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162"
+ HKLM,%FontSubStr%,"Helv",,"MS Sans Serif"
+ HKLM,%FontSubStr%,"Helvetica",,"Arial"
+-HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma"
++HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Liberation Sans"
+ HKLM,%FontSubStr%,"Times",,"Times New Roman"
+ HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186"
+ HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238"
+ HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204"
+ HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161"
+ HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162"
++HKLM,%FontSubStr%,"MS Sans Serif",,"Liberation Serif"
+ HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060
+
+ [MCI]
--- dlls/gdi32/freetype.c.orig 2010-05-19 22:02:43.000000000 +0200
-+++ dlls/gdi32/freetype.c 2010-05-19 23:57:27.000000000 +0200
++++ dlls/gdi32/freetype.c 2010-07-16 11:43:15.000000000 +0200
@@ -400,7 +400,7 @@
/* Interesting and well-known (frequently-assumed!) font names */
static const WCHAR Lucida_Sans_Unicode[] = {'L','u','c','i','d','a',' ','S','a','n','s',' ','U','n','i','c','o','d','e',0};
@@ -9,7 +27,17 @@
static const WCHAR MS_UI_Gothic[] = {'M','S',' ','U','I',' ','G','o','t','h','i','c',0};
static const WCHAR SimSun[] = {'S','i','m','S','u','n',0};
static const WCHAR Gulim[] = {'G','u','l','i','m',0};
-@@ -1641,7 +1641,7 @@
+@@ -494,6 +494,9 @@
+ 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\',
+ 'S','y','s','t','e','m','L','i','n','k',0};
+
++static const char liberationsans[] = {'Z',':','\\','u','s','r','\\','s','h','a','r','e','\\','f','o','n','t','s','\\','l','i','b','e','r','a','t','i','o','n','\\','L','i','b','e','r','a','t','i','o','n','S','a','n','s','-','R','e','g','u','l','a','r','.','t','t','f',0};
++static const char liberationserif[] = {'Z',':','\\','u','s','r','\\','s','h','a','r','e','\\','f','o','n','t','s','\\','l','i','b','e','r','a','t','i','o','n','\\','L','i','b','e','r','a','t','i','o','n','S','e','r','i','f','-','R','e','g','u','l','a','r','.','t','t','f',0};
++
+ /****************************************
+ * Notes on .fon files
+ *
+@@ -1641,7 +1644,7 @@
WCHAR *entry, *next;
SYSTEM_LINKS *font_link, *system_font_link;
CHILD_FONT *child_font;
@@ -18,7 +46,7 @@
static const WCHAR System[] = {'S','y','s','t','e','m',0};
FONTSIGNATURE fs;
Family *family;
-@@ -1723,25 +1723,25 @@
+@@ -1723,25 +1726,25 @@
RegCloseKey(hkey);
}
@@ -49,7 +77,7 @@
{
CHILD_FONT *font_link_entry;
LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry)
-@@ -2193,21 +2193,21 @@
+@@ -2193,21 +2196,21 @@
/* Latin 1 (United States) */
{ 1252, 437, "vgaoem.fon", "vgafix.fon", "vgasys.fon",
"coure.fon", "serife.fon", "smalle.fon", "sserife.fon",
@@ -74,7 +102,7 @@
"Fixedsys,238", "System,238",
"Courier New,238", "MS Serif,238", "Small Fonts,238",
"MS Sans Serif,238", "MS Sans Serif,238", "MS Serif,238",
-@@ -2218,7 +2218,7 @@
+@@ -2218,7 +2221,7 @@
/* Cyrillic */
{ 1251, 866, "vga866.fon", "vgafixr.fon", "vgasysr.fon",
"courer.fon", "serifer.fon", "smaller.fon", "sserifer.fon",
@@ -83,7 +111,7 @@
"Fixedsys,204", "System,204",
"Courier New,204", "MS Serif,204", "Small Fonts,204",
"MS Sans Serif,204", "MS Sans Serif,204", "MS Serif,204",
-@@ -2229,7 +2229,7 @@
+@@ -2229,7 +2232,7 @@
/* Greek */
{ 1253, 737, "vga869.fon", "vgafixg.fon", "vgasysg.fon",
"coureg.fon", "serifeg.fon", "smalleg.fon", "sserifeg.fon",
@@ -92,7 +120,7 @@
"Fixedsys,161", "System,161",
"Courier New,161", "MS Serif,161", "Small Fonts,161",
"MS Sans Serif,161", "MS Sans Serif,161", "MS Serif,161",
-@@ -2240,7 +2240,7 @@
+@@ -2240,7 +2243,7 @@
/* Turkish */
{ 1254, 857, "vga857.fon", "vgafixt.fon", "vgasyst.fon",
"couret.fon", "serifet.fon", "smallet.fon", "sserifet.fon",
@@ -101,7 +129,7 @@
"Fixedsys,162", "System,162",
"Courier New,162", "MS Serif,162", "Small Fonts,162",
"MS Sans Serif,162", "MS Sans Serif,162", "MS Serif,162",
-@@ -2251,7 +2251,7 @@
+@@ -2251,7 +2254,7 @@
/* Hebrew */
{ 1255, 862, "vgaoem.fon", "vgaf1255.fon", "vgas1255.fon",
"coue1255.fon", "sere1255.fon", "smae1255.fon", "ssee1255.fon",
@@ -110,7 +138,7 @@
"Fixedsys,177", "System,177",
"Courier New,177", "MS Serif,177", "Small Fonts,177",
"MS Sans Serif,177", "MS Sans Serif,177", "MS Serif,177",
-@@ -2260,7 +2260,7 @@
+@@ -2260,7 +2263,7 @@
/* Arabic */
{ 1256, 720, "vgaoem.fon", "vgaf1256.fon", "vgas1256.fon",
"coue1256.fon", "sere1256.fon", "smae1256.fon", "ssee1256.fon",
@@ -119,7 +147,7 @@
"Fixedsys,178", "System,178",
"Courier New,178", "MS Serif,178", "Small Fonts,178",
"MS Sans Serif,178", "MS Sans Serif,178", "MS Serif,178",
-@@ -2269,7 +2269,7 @@
+@@ -2269,7 +2272,7 @@
/* Baltic */
{ 1257, 775, "vga775.fon", "vgaf1257.fon", "vgas1257.fon",
"coue1257.fon", "sere1257.fon", "smae1257.fon", "ssee1257.fon",
@@ -128,7 +156,7 @@
"Fixedsys,186", "System,186",
"Courier New,186", "MS Serif,186", "Small Fonts,186",
"MS Sans Serif,186", "MS Sans Serif,186", "MS Serif,186",
-@@ -2280,14 +2280,14 @@
+@@ -2280,14 +2283,14 @@
/* Vietnamese */
{ 1258, 1258, "vga850.fon", "vgafix.fon", "vgasys.fon",
"coure.fon", "serife.fon", "smalle.fon", "sserife.fon",
@@ -145,7 +173,7 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
{ 0 }, { 0 }, { 0 }
},
-@@ -2325,7 +2325,7 @@
+@@ -2325,7 +2328,7 @@
{
Lucida_Sans_Unicode,
Microsoft_Sans_Serif,
@@ -154,7 +182,7 @@
};
static const struct font_links_defaults_list
-@@ -2337,7 +2337,7 @@
+@@ -2337,7 +2340,7 @@
} font_links_defaults_list[] =
{
/* Non East-Asian */
@@ -163,21 +191,14 @@
{ MS_UI_Gothic, SimSun, Gulim, PMingLiU, NULL }
},
/* Below lists are courtesy of
---- tools/wine.inf.in.orig 2010-05-26 07:41:44.000000000 +0200
-+++ tools/wine.inf.in 2010-05-26 07:46:15.000000000 +0200
-@@ -576,13 +576,14 @@
- HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162"
- HKLM,%FontSubStr%,"Helv",,"MS Sans Serif"
- HKLM,%FontSubStr%,"Helvetica",,"Arial"
--HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma"
-+HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Liberation Sans"
- HKLM,%FontSubStr%,"Times",,"Times New Roman"
- HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186"
- HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238"
- HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204"
- HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161"
- HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162"
-+HKLM,%FontSubStr%,"MS Sans Serif",,"Liberation Serif"
- HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060
+@@ -2399,8 +2402,8 @@
+ static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl)
+ {
+ RegSetValueExA(hkey, "Courier", 0, REG_SZ, (const BYTE *)fl->courier, strlen(fl->courier)+1);
+- RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)fl->serif, strlen(fl->serif)+1);
+- RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)fl->sserif, strlen(fl->sserif)+1);
++ RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)liberationserif, strlen(liberationserif)+1);
++ RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)liberationsans, strlen(liberationsans)+1);
+ RegSetValueExA(hkey, "Small Fonts", 0, REG_SZ, (const BYTE *)fl->small, strlen(fl->small)+1);
+ }
- [MCI]
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-13/wine.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- wine.spec 12 Jul 2010 15:41:43 -0000 1.128
+++ wine.spec 16 Jul 2010 19:58:03 -0000 1.129
@@ -1,13 +1,13 @@
%define no64bit 0
Name: wine
Version: 1.2.0
-Release: 0.7.rc7%{?dist}
+Release: 1%{?dist}
Summary: A Windows 16/32/64 bit emulator
Group: Applications/Emulators
License: LGPLv2+
URL: http://www.winehq.org/
-Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc7.tar.bz2
+Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2.tar.bz2
Source1: wine.init
Source3: wine-README-Fedora
Source4: wine-32.conf
@@ -108,11 +108,16 @@ BuildRequires: dbus-devel hal-devel
BuildRequires: gnutls-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: gsm-devel
-BuildRequires: openal-soft-devel
BuildRequires: libv4l-devel
BuildRequires: fontpackages-devel
-BuildRequires: icoutils
BuildRequires: ImageMagick-devel
+
+%if 0%{?fedora} > 9
+BuildRequires: icoutils
+BuildRequires: openal-soft-devel
+%endif
+
+
Requires: wine-desktop = %{version}-%{release}
Requires: wine-fonts = %{version}-%{release}
@@ -402,6 +407,7 @@ Requires: wine-core = %{version}-%{relea
%description oss
This package adds an oss driver for wine.
+%if 0%{?fedora} > 9
%package openal
Summary: Openal support for wine
Group: System Environment/Libraries
@@ -409,10 +415,10 @@ Requires: wine-core = %{version}-%{relea
%description openal
This package adds an openal driver for wine.
-
+%endif
%prep
-%setup -q -n %{name}-1.2-rc7
+%setup -q -n %{name}-1.2
%patch1
%patch100
@@ -464,7 +470,8 @@ install -p -m 644 %{SOURCE201} \
%{buildroot}%{_datadir}/desktop-directories/Wine.directory
-# install desktop files
+# extract and install icons
+%if 0%{?fedora} > 9
mkdir -p %{buildroot}%{_datadir}/pixmaps
icotool -x --width=32 --height=32 --bit-depth=32 -o dlls/user32/resources/ \
dlls/user32/resources/oic_winlogo.ico
@@ -475,60 +482,74 @@ icotool -x --width=32 --height=32 --bit-
programs/notepad/notepad.ico
install -p -m 644 programs/notepad/notepad*png \
%{buildroot}%{_datadir}/pixmaps/notepad.png
-desktop-file-install \
- --vendor=fedora \
- --dir=%{buildroot}%{_datadir}/applications \
- %{SOURCE100}
icotool -x --width=32 --height=32 --bit-depth=32 -o programs/regedit/ \
programs/regedit/regedit.ico
install -p -m 644 programs/regedit/regedit*png \
%{buildroot}%{_datadir}/pixmaps/regedit.png
-desktop-file-install \
- --vendor=fedora \
- --dir=%{buildroot}%{_datadir}/applications \
- %{SOURCE101}
icotool -x --width=32 --height=32 --bit-depth=32 -o programs/msiexec/ \
programs/msiexec/msiexec.ico
install -p -m 644 programs/msiexec/msiexec*png \
%{buildroot}%{_datadir}/pixmaps/msiexec.png
-desktop-file-install \
- --vendor=fedora \
- --dir=%{buildroot}%{_datadir}/applications \
- %{SOURCE102}
icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winecfg/ \
programs/winecfg/winecfg.ico
install -p -m 644 programs/winecfg/winecfg*png \
%{buildroot}%{_datadir}/pixmaps/winecfg.png
-desktop-file-install \
- --vendor=fedora \
- --dir=%{buildroot}%{_datadir}/applications \
- %{SOURCE103}
icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winefile/ \
programs/winefile/winefile.ico
install -p -m 644 programs/winefile/winefile*png \
%{buildroot}%{_datadir}/pixmaps/winefile.png
-desktop-file-install \
- --vendor=fedora \
- --dir=%{buildroot}%{_datadir}/applications \
- %{SOURCE104}
icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winemine/ \
programs/winemine/winemine.ico
install -p -m 644 programs/winemine/winemine*png \
%{buildroot}%{_datadir}/pixmaps/winemine.png
-desktop-file-install \
- --vendor=fedora \
- --dir=%{buildroot}%{_datadir}/applications \
- %{SOURCE105}
icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winhlp32/ \
programs/winhlp32/winhelp.ico
install -p -m 644 programs/winhlp32/winhelp*png \
%{buildroot}%{_datadir}/pixmaps/winhelp.png
+
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/wordpad/ \
+ programs/wordpad/wordpad.ico
+install -p -m 644 programs/wordpad/wordpad*png \
+ %{buildroot}%{_datadir}/pixmaps/wordpad.png
+%endif
+
+# install desktop files
+desktop-file-install \
+ --vendor=fedora \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{SOURCE100}
+
+desktop-file-install \
+ --vendor=fedora \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{SOURCE101}
+
+desktop-file-install \
+ --vendor=fedora \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{SOURCE102}
+
+desktop-file-install \
+ --vendor=fedora \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{SOURCE103}
+
+desktop-file-install \
+ --vendor=fedora \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{SOURCE104}
+
+desktop-file-install \
+ --vendor=fedora \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{SOURCE105}
+
desktop-file-install \
--vendor=fedora \
--dir=%{buildroot}%{_datadir}/applications \
@@ -539,10 +560,6 @@ desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE107}
-icotool -x --width=32 --height=32 --bit-depth=32 -o programs/wordpad/ \
- programs/wordpad/wordpad.ico
-install -p -m 644 programs/wordpad/wordpad*png \
- %{buildroot}%{_datadir}/pixmaps/wordpad.png
desktop-file-install \
--vendor=fedora \
--dir=%{buildroot}%{_datadir}/applications \
@@ -661,8 +678,10 @@ update-desktop-database &>/dev/null || :
%post oss -p /sbin/ldconfig
%postun oss -p /sbin/ldconfig
+%if 0%{?fedora} > 9
%post openal -p /sbin/ldconfig
%postun openal -p /sbin/ldconfig
+%endif
%files
%defattr(-,root,root,-)
@@ -1120,7 +1139,6 @@ update-desktop-database &>/dev/null || :
%{_datadir}/wine/generic.ppd
%{_datadir}/wine/wine.inf
%{_datadir}/wine/l_intl.nls
-%{_datadir}/pixmaps/*png
%files fonts
%defattr(-,root,root,-)
@@ -1178,7 +1196,10 @@ update-desktop-database &>/dev/null || :
%{_datadir}/desktop-directories/Wine.directory
%{_sysconfdir}/xdg/menus/applications-merged/wine.menu
%{_initrddir}/wine
+
+%if 0%{?fedora} > 9
%{_datadir}/pixmaps/*png
+%endif
# esd subpackage
%files esd
@@ -1259,11 +1280,21 @@ update-desktop-database &>/dev/null || :
%defattr(-,root,root,-)
%{_libdir}/wine/wineoss.drv.so
+%if 0%{?fedora} > 9
%files openal
%defattr(-,root,root,-)
%{_libdir}/wine/openal32.dll.so
+%endif
%changelog
+* Fri Jul 16 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-1
+- final release
+
+* Fri Jul 16 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.8.rc7
+- improve font patch
+
* Sun Jul 11 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.2-0.7.rc7
- version upgrade
- Previous message: rpms/wine/F-12 .cvsignore, 1.93, 1.94 sources, 1.94, 1.95 wine-fonts.patch, 1.1, 1.2 wine.spec, 1.131, 1.132
- Next message: rpms/wine/devel .cvsignore, 1.91, 1.92 sources, 1.92, 1.93 wine-fonts.patch, 1.1, 1.2 wine.spec, 1.129, 1.130
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list