Merge commit 'a26a38' from DEVEL branch

(skipping the compholio patches on DEVEL)

diff --git a/wine.spec b/wine.spec
index 94b4f84e68da4230df7309855db358cf44453119..b079ea5ffc6663b42ed3542206f9b2e76bff61f4 100644 (file)
--- a/wine.spec
+++ b/wine.spec
@@ -4,19 +4,30 @@
 %bcond_without capi            # don't build CAPI 2.0 (ISDN) support
 %bcond_without gstreamer       # don't build GStreamer filters support
 %bcond_without sane            # don't build TWAIN DLL with scanning support (through SANE)
+%bcond_with    hal             # HAL dynamic device support [deprecated]
 %bcond_without ldap            # don't build LDAP DLL
 %bcond_without cups            # without CUPS printing support in winspool,wineps DLLs
 %bcond_without netapi          # don't use the Samba NetAPI library
 #
 # NOTE: wine detects the following SONAMES for dlopen at build time:
-#   libcrypto,libssl (wininet.dll)
-#   libcups (winspool.dll.so,wineps.dll.so)
-#   libcurses/libncurses (wineconsole program)
+#   libGL (winex11.drv.so)
+#   libOSMesa (gdi32.dll.so)
+#   libX11 libXcomposite libXcursor libXext libXi libXinerama libXrandr libXrender libXxf86vm (winex11.drv.so)
+#   libcapi20 (capi2032.dll.so)
+#   libcups (winspool.drv.so)
+#   libdbus (mountmgr.sys.so)
 #   libfontconfig (gdi32.dll.so)
-#   libfreetype (wineps.dll.so,gdi32.dll.so)
-#   libGL (x11drv.dll.so,ddraw.dll.so)
-#   libX11, libXext, libXi, libXrender (x11drv.dll.so)
-#   libpng (windowscodecs.dll: SONAME_LIBPNG in dlls/windowscodecs/pngformat.c)
+#   libfreetype (gdi32.dll.so)
+#   libgnutls (secur32.dll.so)
+#   libhal (mountmgr.sys.so)
+#   libjpeg (gphoto2.ds.so windowscodecs.dll.so)
+#   libncurses (kernel32.dll.so)
+#   libodbc (odbc32.dll.so)
+#   libpng (windowscodecs.dll.so)
+#   libsane (sane.ds.so)
+#   libtiff (windowscodecs.dll.so)
+#   libv4l1 (qcap.dll.so)
+#   libxslt (msxml3.dll.so)
 # thus requires rebuild after change of any of the above.
 
 # library qualifier in rpm generated deps
@@ -54,13 +65,15 @@ Patch5:             %{name}-ca_certificates.patch
 Patch6:                desktop.patch
 Patch7:                %{name}-wine64_man.patch
 URL:           http://www.winehq.org/
+BuildRequires: Mesa-libOSMesa-devel
 BuildRequires: OpenAL-devel >= 1.1
-BuildRequires: ocl-icd-libOpenCL-devel
+BuildRequires: OpenCL-devel
 BuildRequires: OpenGL-GLU-devel
+BuildRequires: OpenGL-GLX-devel
 BuildRequires: Mesa-libOSMesa-devel
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 %{?with_arts:BuildRequires:    artsc-devel}
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake
 BuildRequires: bison
 %{?with_capi:BuildRequires:    capi4k-utils-devel}
@@ -68,46 +81,55 @@ BuildRequires:      bison
 BuildRequires: dbus-devel
 BuildRequires: docbook-dtd31-sgml
 BuildRequires: docbook-utils
-BuildRequires: flex
+BuildRequires: flex >= 2.5.33
 BuildRequires: fontconfig-devel
 BuildRequires: fontforge
 BuildRequires: freetype-devel >= 2.0.5
+# for findup used after make install
 BuildRequires: fslint
-BuildRequires: gettext-devel
+%ifarch %{x8664}
+BuildRequires: gcc >= 6:4.4
+%endif
+BuildRequires: gettext-tools
 BuildRequires: giflib-devel
 BuildRequires: gnutls-devel
-%{?with_gstreamer:BuildRequires:       gstreamer0.10-plugins-base-devel}
-BuildRequires: icoutils
-BuildRequires: lcms2-devel
+%{?with_gstreamer:BuildRequires:       gstreamer0.10-devel >= 0.10}
+%{?with_gstreamer:BuildRequires:       gstreamer0.10-plugins-base-devel >= 0.10}
+%{?with_hal:BuildRequires:     hal-devel}
+# for icotool used in build
+BuildRequires: icoutils >= 0.29.0
+BuildRequires: lcms2-devel >= 2
 BuildRequires: libgphoto2-devel
 BuildRequires: libgsm-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libmpg123-devel >= 1.5.0
+BuildRequires: libpng-devel >= 1.5
+BuildRequires: libtiff-devel
 BuildRequires: libtool
 BuildRequires: libv4l-devel
+BuildRequires: libxml2-devel >= 2.0
 BuildRequires: libxslt-devel
 BuildRequires: ncurses-devel
 # db2* failed previously - probably openjade or opensp bug
-BuildRequires: libpng-devel >= 1.5
 BuildRequires: openjade >= 1:1.3.3-0.pre1
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: opensp >= 1:1.5.1
-BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pkgconfig
 BuildRequires: prelink
 BuildRequires: samba-devel
 %{?with_sane:BuildRequires:    sane-backends-devel}
 BuildRequires: unixODBC-devel >= 2.2.12-2
 #BuildRequires:        valgrind
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXcomposite-devel
 BuildRequires: xorg-lib-libXcursor-devel
+BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-lib-libXrender-devel
-BuildRequires: xorg-lib-libXxf86dga-devel
 BuildRequires: xorg-lib-libXxf86vm-devel
+BuildRequires: zlib-devel
 Requires:      libfreetype.so.6%{libqual}
 Requires:      libpng16.so.16%{libqual}
 Requires(post):        /sbin/ldconfig
@@ -127,11 +149,10 @@ Obsoletes:        wine-doc-pdf
 Obsoletes:     wine-drv-arts
 Obsoletes:     wine-drv-jack
 Obsoletes:     wine-drv-nas
-ExclusiveArch: %{ix86} %{x8664}
+ExclusiveArch: %{ix86} %{x8664} arm
 ExcludeArch:   i386
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreqdep           libGL.so.1 libGLU.so.1
 %define                no_install_post_strip   1
 
 %define                _winedir                %{_datadir}/%{name}
@@ -201,11 +222,10 @@ Group:            Applications/Emulators
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description dll-capi
-CAPI 2.0 (ISDN) implementation DLLs for Wine (through OpenGL).
+CAPI 2.0 (ISDN) implementation DLLs for Wine.
 
 %description dll-capi -l pl.UTF-8
-Biblioteki DLL z implementacją CAPI 2.0 (ISDN) dla Wine (poprzez
-OpenGL).
+Biblioteki DLL z implementacją CAPI 2.0 (ISDN) dla Wine.
 
 %package dll-d3d
 Summary:       Direct3D implementation DLLs for Wine
@@ -247,11 +267,15 @@ Biblioteka DLL z implementacją TWAIN dla Wine (poprzez SANE).
 
 %package dll-ldap
 Summary:       Win32 LDAP API DLL for Wine
+Summary(pl.UTF-8):     Biblioteka DLL z implementacją API Win32 LDAP dla Wine
 Group:         Applications/Emulators
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description dll-ldap
-Lightweight Directory Access Protocol Library.
+Lightweight Directory Access Protocol Library for Wine.
+
+%description dll-ldap -l pl.UTF-8
+Biblioteka LDAP (Lightweight Directory Access Protocol) dla Wine.
 
 %package drv-alsa
 Summary:       ALSA driver for WINE mm.dll implementation
@@ -287,11 +311,11 @@ mv -f oic_winlogo_*.png %{name}.png
 %ifarch %{x8664}
        --enable-win64 \
 %endif
-       --with%{!?with_alsa:out}-alsa \
-       --with%{!?with_capi:out}-capi \
+       --with-alsa%{!?with_alsa:=no} \
+       --with-capi%{!?with_capi:=no} \
        --with-cms \
        --with-coreaudio \
-       --with%{!?with_cups:out}-cups \
+       --with-cups%{!?with_cups:=no} \
        --with-curses \
        --with-dbus \
        --with-fontconfig \
@@ -300,10 +324,10 @@ mv -f oic_winlogo_*.png %{name}.png
        --with-glu \
        --with-gnutls \
        --with-gsm \
-       --with%{!?with_gstreamer:out}-gstreamer \
-       --without-hal \
+       %{__with_without gstreamer} \
+       %{__with_without hal} \
        --with-jpeg \
-       --with%{!?with_ldap:out}-ldap \
+       --with-ldap%{!?with_ldap:=no} \
        --with-mpg123 \
        --with%{!?with_netapi:out}-netapi \
        --with-openal \
@@ -578,6 +602,5 @@ fi
 %endif
 
 # additional dependencies in *.so not separated (yet?) from main package
-#   ddraw.dll.so,x11drv.dll.so depend on X11 libs
-#   ole2disp.dll.so,oleaut32.dll.so,typelib.dll.so depend on lib(un)gif,libjpeg,libX11
-#   ttydrv.dll.so depends on ncurses
+#   ddraw.dll.so,winex11.drv.so depend on X11 libs
+#   ole2disp.dll16.so,oleaut32.dll.so,typelib.dll16.so depend on libX11