From 097ac3a864af95474b89b5b598dcbf1a7d8f6603 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Thu, 9 May 2013 11:07:13 +0200
Subject: [PATCH] 1.5.29-1

- version upgrade
---
 .gitignore |  6 ++----
 sources    |  4 ++--
 wine.spec  | 46 +++++++++++++++++++++++-----------------------
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7a387e..7a6cdae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 /wine-1.4.tar.bz2
 /wine-1.4.tar.bz2.sign
-/wine-1.5.26.tar.bz2
-/wine-1.5.26.tar.bz2.sign
-/wine-1.5.27.tar.bz2
-/wine-1.5.27.tar.bz2.sign
+/wine-1.5.29.tar.bz2
+/wine-1.5.29.tar.bz2.sign
diff --git a/sources b/sources
index 0a06ab4..b047667 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ac24b230e2a18556d21e7243ccb24283  wine-1.5.27.tar.bz2
-f2793f673706504affa6c6a7319843d2  wine-1.5.27.tar.bz2.sign
+4a7dc9dad3c3c7710c202458374ed21c  wine-1.5.29.tar.bz2
+811c84aa828abd82d97754b9e9c48b3c  wine-1.5.29.tar.bz2.sign
diff --git a/wine.spec b/wine.spec
index 9cd3207..245c2ba 100644
--- a/wine.spec
+++ b/wine.spec
@@ -3,7 +3,7 @@
 %global winemono  0.0.8
 
 Name:           wine
-Version:        1.5.27
+Version:        1.5.29
 Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
@@ -93,7 +93,6 @@ BuildRequires:  libxslt-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openldap-devel
 BuildRequires:  unixODBC-devel
-BuildRequires:  openssl-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  zlib-devel
 BuildRequires:  fontforge freetype-devel
@@ -217,13 +216,6 @@ Requires:       nss-mdns(x86-32)
 Requires:       gnutls(x86-32)
 Requires:       libXrender(x86-32)
 Requires:       libXcursor(x86-32)
-
-%if 0%{?fedora} >= 18
-Requires:       openssl-libs(x86-32)
-%else
-Requires:       openssl(x86-32)
-%endif
-
 %endif
 
 %ifarch x86_64
@@ -232,13 +224,6 @@ Requires:       nss-mdns(x86-64)
 Requires:       gnutls(x86-64)
 Requires:       libXrender(x86-64)
 Requires:       libXcursor(x86-64)
-
-%if 0%{?fedora} >= 18
-Requires:       openssl-libs(x86-64)
-%else
-Requires:       openssl(x86-64)
-%endif
-
 %endif
 
 %ifarch %{arm}
@@ -247,13 +232,6 @@ Requires:       nss-mdns
 Requires:       gnutls
 Requires:       libXrender
 Requires:       libXcursor
-
-%if 0%{?fedora} >= 18
-Requires:       openssl-libs
-%else
-Requires:       openssl
-%endif
-
 %endif
 
 # old removed packages
@@ -363,6 +341,7 @@ Summary:       Wine font files
 Group:         Applications/Emulators
 BuildArch:     noarch
 Requires:      wine-courier-fonts = %{version}-%{release}
+Requires:      wine-fixedsys-fonts = %{version}-%{release}
 Requires:      wine-small-fonts = %{version}-%{release}
 Requires:      wine-system-fonts = %{version}-%{release}
 Requires:      wine-marlett-fonts = %{version}-%{release}
@@ -388,6 +367,15 @@ Requires:      fontpackages-filesystem
 %description courier-fonts
 %{summary}
 
+%package fixedsys-fonts
+Summary:       Wine Fixedsys font family
+Group:         User Interface/X
+BuildArch:     noarch
+Requires:      fontpackages-filesystem
+
+%description fixedsys-fonts
+%{summary}
+
 %package small-fonts
 Summary:       Wine Small font family
 Group:         User Interface/X
@@ -725,6 +713,9 @@ install -p -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 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/
@@ -1127,6 +1118,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/msvcp80.dll.so
 %{_libdir}/wine/msvcp90.dll.so
 %{_libdir}/wine/msvcp100.dll.so
+%{_libdir}/wine/msvcp110.dll.so
 %{_libdir}/wine/msvcr70.dll.so
 %{_libdir}/wine/msvcr71.dll.so
 %{_libdir}/wine/msvcr80.dll.so
@@ -1411,6 +1403,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc COPYING.LIB
 %{_datadir}/fonts/wine-courier-fonts
 
+%files fixedsys-fonts
+%doc COPYING.LIB
+%{_datadir}/fonts/wine-fixedsys-fonts
+
 %files system-fonts
 %doc COPYING.LIB
 %{_datadir}/fonts/wine-system-fonts
@@ -1530,6 +1526,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Thu May 09 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.5.29-1
+- version upgrade
+
 * Sat Mar 30 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.5.27-1
 - version upgrade