- up to 7.6, adapterize

diff --git a/wine.spec b/wine.spec
index ffcd8cb1e3c1233945966a283c52ca32e1e375ad..1e3a8e9d082f21bc941a13172e67dd83e4d23692 100644 (file)
--- a/wine.spec
+++ b/wine.spec
@@ -34,7 +34,7 @@
 %define        libqual %{nil}
 %endif
 
 %define        libqual %{nil}
 %endif
 

-%ifarch %{x8664} 
+%ifarch %{x8664}

 %define        winelib x86_64
 %else
 %define        winelib i386
 %define        winelib x86_64
 %else
 %define        winelib i386


@@ -46,13 +46,13 @@ Summary(es.UTF-8):  Ejecuta programas Windows en Linux
 Summary(pl.UTF-8):     Program pozwalający uruchamiać aplikacje Windows
 Summary(pt_BR.UTF-8):  Executa programas Windows no Linux
 Name:          wine
 Summary(pl.UTF-8):     Program pozwalający uruchamiać aplikacje Windows
 Summary(pt_BR.UTF-8):  Executa programas Windows no Linux
 Name:          wine

-Version:       7.3
-Release:       2
+Version:       7.6
+Release:       1

 Epoch:         1
 License:       LGPL
 Group:         Applications/Emulators
 Source0:       https://dl.winehq.org/wine/source/7.x/%{name}-%{version}.tar.xz
 Epoch:         1
 License:       LGPL
 Group:         Applications/Emulators
 Source0:       https://dl.winehq.org/wine/source/7.x/%{name}-%{version}.tar.xz

-# Source0-md5: 5a52776788f27cb4181dda24fc5eaf45
+# Source0-md5: 2a15c22b7a7f56503291381a9f608ecb

 Source1:       https://dl.winehq.org/wine/wine-gecko/%{gecko_ver}/%{name}-gecko-%{gecko_ver}-x86.msi
 # Source1-md5: e0a26e37397961b2c7f624575590ef66
 Source2:       https://dl.winehq.org/wine/wine-gecko/%{gecko_ver}/%{name}-gecko-%{gecko_ver}-x86_64.msi
 Source1:       https://dl.winehq.org/wine/wine-gecko/%{gecko_ver}/%{name}-gecko-%{gecko_ver}-x86.msi
 # Source1-md5: e0a26e37397961b2c7f624575590ef66
 Source2:       https://dl.winehq.org/wine/wine-gecko/%{gecko_ver}/%{name}-gecko-%{gecko_ver}-x86_64.msi


@@ -66,12 +66,11 @@ Patch5:             %{name}-ca_certificates.patch
 Patch6:                desktop.patch
 Patch7:                %{name}-wine64_man.patch
 URL:           http://www.winehq.org/
 Patch6:                desktop.patch
 Patch7:                %{name}-wine64_man.patch
 URL:           http://www.winehq.org/

-BuildConflicts:        crossmingw32-gcc
-BuildConflicts:        crossmingw64-gcc

 BuildRequires: Mesa-libOSMesa-devel
 BuildRequires: OpenAL-devel >= 1.1
 BuildRequires: OpenCL-devel
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: Mesa-libOSMesa-devel
 BuildRequires: OpenAL-devel >= 1.1
 BuildRequires: OpenCL-devel
 BuildRequires: OpenGL-GLU-devel

+BuildRequires: SDL2-devel

 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 %{?with_arts:BuildRequires:    artsc-devel}
 BuildRequires: autoconf >= 2.62
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 %{?with_arts:BuildRequires:    artsc-devel}
 BuildRequires: autoconf >= 2.62


@@ -85,6 +84,8 @@ BuildRequires:        flex >= 2.5.33
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel >= 2.0.5
 BuildRequires: gettext-devel
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel >= 2.0.5
 BuildRequires: gettext-devel

+BuildConflicts:        crossmingw32-gcc
+BuildConflicts:        crossmingw64-gcc

 %ifarch %{x8664}
 BuildRequires: gcc >= 6:4.4
 %endif
 %ifarch %{x8664}
 BuildRequires: gcc >= 6:4.4
 %endif


@@ -96,8 +97,10 @@ BuildRequires:       gnutls-devel
 BuildRequires: icoutils >= 0.29.0
 BuildRequires: lcms2-devel >= 2
 BuildRequires: libcap-devel
 BuildRequires: icoutils >= 0.29.0
 BuildRequires: lcms2-devel >= 2
 BuildRequires: libcap-devel

+BuildRequires: libglvnd-libEGL-devel

 BuildRequires: libgphoto2-devel
 BuildRequires: libpcap-devel
 BuildRequires: libgphoto2-devel
 BuildRequires: libpcap-devel

+BuildRequires: libv4l-devel

 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-devel


@@ -327,7 +330,7 @@ rm -f oic_winlogo_*.png
        --with-xshm \
        --with-xxf86vm \
        --with-x
        --with-xshm \
        --with-xxf86vm \
        --with-x

-       
+

 %{__make} depend
 %{__make}
 
 %{__make} depend
 %{__make}
 


@@ -382,16 +385,16 @@ for dir in $RPM_BUILD_ROOT%{_mandir}/*.UTF-8 ; do
 done
 
 %ifarch %{x8664}
 done
 
 %ifarch %{x8664}

-install loader/wine.man $RPM_BUILD_ROOT%{_mandir}/man1/wine64.1
+cp -p loader/wine.man $RPM_BUILD_ROOT%{_mandir}/man1/wine64.1

 for lang in de fr pl ; do
 install -d $RPM_BUILD_ROOT%{_mandir}/${lang}/man1
 for lang in de fr pl ; do
 install -d $RPM_BUILD_ROOT%{_mandir}/${lang}/man1

-install loader/wine.${lang}.UTF-8.man $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/wine64.1
+cp -p loader/wine.${lang}.UTF-8.man $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/wine64.1

 done
 %else
 done
 %else

-install loader/wine.man $RPM_BUILD_ROOT%{_mandir}/man1/wine.1
+cp -p loader/wine.man $RPM_BUILD_ROOT%{_mandir}/man1/wine.1

 for lang in de fr pl ; do
 install -d $RPM_BUILD_ROOT%{_mandir}/${lang}/man1
 for lang in de fr pl ; do
 install -d $RPM_BUILD_ROOT%{_mandir}/${lang}/man1

-install loader/wine.${lang}.UTF-8.man $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/wine.1
+cp -p loader/wine.${lang}.UTF-8.man $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/wine.1

 done
 %endif
 
 done
 %endif
 


@@ -421,7 +424,7 @@ if [ -x /sbin/chkconfig ]; then
        /sbin/chkconfig --del wine
 fi
 
        /sbin/chkconfig --del wine
 fi
 

-%files 
+%files

 %defattr(644,root,root,755)
 %doc README AUTHORS ANNOUNCE
 %lang(de) %doc documentation/README.de
 %defattr(644,root,root,755)
 %doc README AUTHORS ANNOUNCE
 %lang(de) %doc documentation/README.de


@@ -523,7 +526,7 @@ fi
 %attr(755,root,root) %{_bindir}/wrc
 # no shared variants, so not separated
 %{_libdir}/wine/%{winelib}-unix/lib*.a
 %attr(755,root,root) %{_bindir}/wrc
 # no shared variants, so not separated
 %{_libdir}/wine/%{winelib}-unix/lib*.a

-%{_libdir}/wine/%{winelib}-windows/lib*.a
+#%{_libdir}/wine/%{winelib}-windows/lib*.a

 %{_includedir}/wine
 %{_mandir}/man1/widl.1*
 %{_mandir}/man1/winebuild.1*
 %{_includedir}/wine
 %{_mandir}/man1/widl.1*
 %{_mandir}/man1/winebuild.1*