Update to 1.9.15

f38
Michael Cronenworth 9 years ago
parent aa3e243d34
commit 3843f57f76

6
.gitignore vendored

@ -1,3 +1,3 @@
/wine-1.9.13.tar.bz2 /wine-1.9.15.tar.bz2
/wine-1.9.13.tar.bz2.sign /wine-1.9.15.tar.bz2.sign
/wine-staging-1.9.13.tar.gz /wine-staging-1.9.15.tar.gz

@ -1,3 +1,3 @@
0ef601ed1eb8e9b800eb0ee334d7ad6a wine-1.9.13.tar.bz2 385ef1e93d45ad871f5d38d52af602dd wine-1.9.15.tar.bz2
21e95ddaa66e8e7c8d650246d749e675 wine-1.9.13.tar.bz2.sign 45d708b63e6e856430759a8e19c4be9f wine-1.9.15.tar.bz2.sign
234c7f88068dc25bd67ab67efda9c319 wine-staging-1.9.13.tar.gz f5ef9cf51e45d4e8d856675c3f57e370 wine-staging-1.9.15.tar.gz

@ -1,27 +0,0 @@
From 8570aa372d00aa6410605b97a78614c61d74c4b3 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Fri, 1 Jul 2016 16:31:11 -0500
Subject: [PATCH] winspool.drv: Support cups 2.2 header update
Signed-off-by: Michael Cronenworth <mike@cchtml.com>
---
dlls/winspool.drv/info.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 3ba94cd..5468066 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -43,6 +43,9 @@
#include <signal.h>
#ifdef HAVE_CUPS_CUPS_H
# include <cups/cups.h>
+# if CUPS_VERSION_MAJOR > 2 || (CUPS_VERSION_MAJOR == 2 && CUPS_VERSION_MINOR > 1)
+# include <cups/ppd.h>
+# endif
#endif
#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
--
2.5.5

@ -25,7 +25,7 @@
%endif %endif
Name: wine Name: wine
Version: 1.9.13 Version: 1.9.15
Release: 1%{?dist} Release: 1%{?dist}
Summary: A compatibility layer for windows applications Summary: A compatibility layer for windows applications
@ -72,7 +72,6 @@ Source501: wine-tahoma.conf
Source502: wine-README-tahoma Source502: wine-README-tahoma
Patch511: wine-cjk.patch Patch511: wine-cjk.patch
Patch512: wine-cups-2.2.patch
# wine compholio patches for wine-staging # wine compholio patches for wine-staging
# pulseaudio-patch is covered by that patch-set, too. # pulseaudio-patch is covered by that patch-set, too.
@ -662,7 +661,6 @@ This package adds the opencl driver for wine.
%prep %prep
%setup -q -n wine-%{version} %setup -q -n wine-%{version}
%patch511 -p1 -b.cjk %patch511 -p1 -b.cjk
%patch512 -p1 -b.cups
# setup and apply wine-staging patches # setup and apply wine-staging patches
gzip -dc %{SOURCE900} | tar -xf - --strip-components=1 gzip -dc %{SOURCE900} | tar -xf - --strip-components=1
@ -1615,6 +1613,7 @@ fi
%{_libdir}/wine/snmpapi.dll.so %{_libdir}/wine/snmpapi.dll.so
%{_libdir}/wine/softpub.dll.so %{_libdir}/wine/softpub.dll.so
%{_libdir}/wine/spoolsv.exe.so %{_libdir}/wine/spoolsv.exe.so
%{_libdir}/wine/sspicli.dll.so
%{_libdir}/wine/stdole2.tlb.so %{_libdir}/wine/stdole2.tlb.so
%{_libdir}/wine/stdole32.tlb.so %{_libdir}/wine/stdole32.tlb.so
%{_libdir}/wine/sti.dll.so %{_libdir}/wine/sti.dll.so
@ -2038,6 +2037,12 @@ fi
%endif %endif
%changelog %changelog
* Fri Jul 29 2016 Michael Cronenworth <mike@cchtml.com> 1.9.15-1
- version update
* Mon Jul 11 2016 Michael Cronenworth <mike@cchtml.com> 1.9.14-1
- version update
* Fri Jul 01 2016 Michael Cronenworth <mike@cchtml.com> 1.9.13-1 * Fri Jul 01 2016 Michael Cronenworth <mike@cchtml.com> 1.9.13-1
- version update - version update

Loading…
Cancel
Save