From dae5dae1c2d80cfedaf84e54bc57de51a4acbe3629af6c9fb6e998fda782753d Mon Sep 17 00:00:00 2001 From: David Mulder Date: Wed, 18 Apr 2018 12:46:33 +0000 Subject: [PATCH] Accepting request 597743 from home:jmcdough:enable-dc-sle15 re-enable python for SLE OBS-URL: https://build.opensuse.org/request/show/597743 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=596 --- samba.spec | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/samba.spec b/samba.spec index 85d6b05..e21c410 100644 --- a/samba.spec +++ b/samba.spec @@ -28,20 +28,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} -%if 0%{?sle_version} >= 150000 && !0%{?is_opensuse} -# SLE15 dropped python2 (bsc#1082139) -# disabling all python things until full python3 port is done -# this removes: -# - contents of package samba-python -# - contents of package libsamba-policy0 -# - contents of package libsamba-policy-devel -# - file libsamba-python-samba4.so from pkg samba-libs -# - file libsamba-net-samba4.so from pkg samba-libs -# - bin & manpage of smbtorture from pkg samba-test -%define with_python 0 -%else %define with_python 1 -%endif %if 0%{?sle_version} >= 150000 && !0%{?is_opensuse} # SLE15 dropped perl-Parse-Yapp @@ -67,7 +54,7 @@ %global with_mitkrb5 1 %global with_dc 0 -%if 0%{?suse_version} > 1320 && 0%{?is_opensuse} +%if 0%{?suse_version} > 1320 %ifnarch ppc %global with_dc 1 %endif