Meta package fixes for EPEL7 (rhbz#1117422)

f38
Michael Cronenworth 11 years ago
parent a294309263
commit 4d1df4f7af

@ -5,7 +5,7 @@
Name: wine Name: wine
Version: 1.7.21 Version: 1.7.21
Release: 1%{?dist} Release: 2%{?dist}
Summary: A compatibility layer for windows applications Summary: A compatibility layer for windows applications
Group: Applications/Emulators Group: Applications/Emulators
@ -136,13 +136,14 @@ Requires: wine-fonts = %{version}-%{release}
# x86-32 parts # x86-32 parts
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%if 0%{?fedora} || 0%{?rhel} <= 6
Requires: wine-core(x86-32) = %{version}-%{release} Requires: wine-core(x86-32) = %{version}-%{release}
Requires: wine-capi(x86-32) = %{version}-%{release} Requires: wine-capi(x86-32) = %{version}-%{release}
Requires: wine-cms(x86-32) = %{version}-%{release} Requires: wine-cms(x86-32) = %{version}-%{release}
Requires: wine-ldap(x86-32) = %{version}-%{release} Requires: wine-ldap(x86-32) = %{version}-%{release}
Requires: wine-twain(x86-32) = %{version}-%{release} Requires: wine-twain(x86-32) = %{version}-%{release}
Requires: wine-pulseaudio(x86-32) = %{version}-%{release} Requires: wine-pulseaudio(x86-32) = %{version}-%{release}
%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %if 0%{?fedora} >= 10 || 0%{?rhel} == 6
Requires: wine-openal(x86-32) = %{version}-%{release} Requires: wine-openal(x86-32) = %{version}-%{release}
%endif %endif
%if 0%{?fedora} >= 17 %if 0%{?fedora} >= 17
@ -153,9 +154,10 @@ Requires: wine-mono = %winemono
Requires: /usr/bin/ntlm_auth Requires: /usr/bin/ntlm_auth
Requires: mesa-dri-drivers(x86-32) Requires: mesa-dri-drivers(x86-32)
%endif %endif
%endif
%ifarch %{ix86} %ifarch %{ix86}
%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %if 0%{?fedora} >= 10 || 0%{?rhel} == 6
Requires: wine-wow(x86-32) = %{version}-%{release} Requires: wine-wow(x86-32) = %{version}-%{release}
%endif %endif
%endif %endif
@ -334,8 +336,12 @@ Requires(postun): desktop-file-utils >= 0.8
%ifarch %{arm} %ifarch %{arm}
Requires: wine-core = %{version}-%{release} Requires: wine-core = %{version}-%{release}
%else %else
%if 0%{?rhel} >= 7
Requires: wine-core(x86-64) = %{version}-%{release}
%else
Requires: wine-core(x86-32) = %{version}-%{release} Requires: wine-core(x86-32) = %{version}-%{release}
%endif %endif
%endif
Requires: wine-common = %{version}-%{release} Requires: wine-common = %{version}-%{release}
%if 0%{?fedora} >= 15 %if 0%{?fedora} >= 15
Requires: wine-systemd = %{version}-%{release} Requires: wine-systemd = %{version}-%{release}
@ -584,6 +590,11 @@ chrpath --delete %{buildroot}%{_bindir}/wine64
chrpath --delete %{buildroot}%{_bindir}/wine chrpath --delete %{buildroot}%{_bindir}/wine
%endif %endif
# RHEL7 dropped 32-bit support, provide symlink for wine apps
%if 0%{?rhel} >= 7
%{__ln_s} %{_bindir}/wine64 %{buildroot}%{_bindir}/wine
%endif
mkdir -p %{buildroot}%{_sysconfdir}/wine mkdir -p %{buildroot}%{_sysconfdir}/wine
# Allow users to launch Windows programs by just clicking on the .exe file... # Allow users to launch Windows programs by just clicking on the .exe file...
@ -903,6 +914,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif %endif
%ifarch x86_64 %ifarch x86_64
%if 0%{?rhel} >= 7
%{_bindir}/wine
%endif
%{_bindir}/wine64 %{_bindir}/wine64
%{_bindir}/wine64-preloader %{_bindir}/wine64-preloader
%config %{_sysconfdir}/ld.so.conf.d/wine-64.conf %config %{_sysconfdir}/ld.so.conf.d/wine-64.conf
@ -1617,6 +1631,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif %endif
%changelog %changelog
* Wed Jul 09 2014 Michael Cronenworth <mike@cchtml.com>
- 1.7.18-2
- Fixes for EPEL7 (rhbz#1117422)
* Tue Jul 01 2014 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> * Tue Jul 01 2014 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.7.21-1 - 1.7.21-1
- version upgrade - version upgrade

Loading…
Cancel
Save