diff --git a/wine.spec b/wine.spec index a267db4..e9ed979 100644 --- a/wine.spec +++ b/wine.spec @@ -40,7 +40,7 @@ Name: wine Version: 4.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A compatibility layer for windows applications License: LGPLv2+ @@ -135,7 +135,9 @@ BuildRequires: systemd-devel BuildRequires: zlib-devel BuildRequires: fontforge freetype-devel BuildRequires: libgphoto2-devel +%if 0%{?fedora} <= 30 BuildRequires: isdn4k-utils-devel +%endif BuildRequires: libpcap-devel # modular x BuildRequires: libX11-devel @@ -190,7 +192,9 @@ Requires: wine-fonts = %{version}-%{release} %ifarch %{ix86} x86_64 %if 0%{?fedora} || 0%{?rhel} <= 6 Requires: wine-core(x86-32) = %{version}-%{release} +%if 0%{?fedora} <= 30 Requires: wine-capi(x86-32) = %{version}-%{release} +%endif Requires: wine-cms(x86-32) = %{version}-%{release} Requires: wine-ldap(x86-32) = %{version}-%{release} Requires: wine-twain(x86-32) = %{version}-%{release} @@ -214,7 +218,9 @@ Requires: mesa-dri-drivers(x86-32) # x86-64 parts %ifarch x86_64 Requires: wine-core(x86-64) = %{version}-%{release} +%if 0%{?fedora} <= 30 Requires: wine-capi(x86-64) = %{version}-%{release} +%endif Requires: wine-cms(x86-64) = %{version}-%{release} Requires: wine-ldap(x86-64) = %{version}-%{release} Requires: wine-twain(x86-64) = %{version}-%{release} @@ -235,7 +241,9 @@ Requires: mesa-dri-drivers(x86-64) # ARM parts %ifarch %{arm} aarch64 Requires: wine-core = %{version}-%{release} +%if 0%{?fedora} <= 30 Requires: wine-capi = %{version}-%{release} +%endif Requires: wine-cms = %{version}-%{release} Requires: wine-ldap = %{version}-%{release} Requires: wine-twain = %{version}-%{release} @@ -251,7 +259,9 @@ Requires: samba-winbind-clients # aarch64 parts %ifarch aarch64 Requires: wine-core(aarch-64) = %{version}-%{release} +%if 0%{?fedora} <= 30 Requires: wine-capi(aarch-64) = %{version}-%{release} +%endif Requires: wine-cms(aarch-64) = %{version}-%{release} Requires: wine-ldap(aarch-64) = %{version}-%{release} Requires: wine-twain(aarch-64) = %{version}-%{release} @@ -354,6 +364,12 @@ Requires: libva Obsoletes: wine-wow < 1.7.35 Provides: wine-wow = %{version}-%{release} +%if 0%{?fedora} >= 31 +# isdn4k-utils has been retired in F31+ +Obsoletes: wine-capi +Provides: wine-capi = %{version}-%{release} +%endif + %description core Wine core package includes the basic wine stuff needed by all other packages. @@ -610,6 +626,7 @@ Requires: sane-backends-libs %description twain Twain support for wine +%if 0%{?fedora} <= 30 %package capi Summary: ISDN support for wine Requires: wine-core = %{version}-%{release} @@ -625,6 +642,7 @@ Requires: isdn4k-utils %description capi ISDN support for wine +%endif %package devel Summary: Wine development environment @@ -1052,7 +1070,9 @@ fi %ldconfig_scriptlets twain +%if 0%{?fedora} <= 30 %ldconfig_scriptlets capi +%endif %ldconfig_scriptlets alsa @@ -2215,9 +2235,11 @@ fi %{_libdir}/wine/twain_32.%{winedll} %{_libdir}/wine/sane.ds.so +%if 0%{?fedora} <= 30 # capi subpackage %files capi %{_libdir}/wine/capi2032.dll.so +%endif %files devel %{_bindir}/function_grep.pl @@ -2265,6 +2287,9 @@ fi %endif %changelog +* Thu Sep 26 2019 Michael Cronenworth 4.16-2 +- Retire capi package as isdn4k-utils has been retired (RHBZ#1756118) + * Sat Sep 14 2019 Michael Cronenworth 4.16-1 - version update