File project.diff of Package saltbundlepy

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package saltbundlepy (Revision 4fb85cfdd7ab09b7e6d44ccc673361f6)

Currently displaying revision 4fb85cfdd7ab09b7e6d44ccc673361f6 , Show latest

--- saltbundlepy.spec.orig
+++ saltbundlepy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package saltbundlepy
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
 %global __brp_python_bytecompile %{nil}
 
 %define build_with_opt 1
-%if 0%{?raspbian} || 0%{?rhel} == 7 || 0%{?suse_version} == 1315
+%if 0%{?raspbian} || 0%{?rhel} == 7 || 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
 %define build_with_opt 0
 %endif
 %if 0%{?debian} == 11
@@ -31,6 +31,7 @@
 %endif
 
 %define _without_idle 1
+%define _without_tk 1
 
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "doc"
@@ -61,7 +62,7 @@
 # based on the current source tarball
 %define python_version_abitag %(c=%{python_version}; echo ${c//./})
 # FIXME %%define python_version_soname %%(c=%%{python_version}; echo ${c//./_})
-%define         python_version_soname   sb3_10
+%define         python_version_soname   sb3_11
 %if 0%(test -n "%{tar_suffix}" && echo 1)
 %define _version %(echo "%{_version}~%{tar_suffix}")
 %define tarversion %{version}
@@ -204,7 +205,7 @@ BuildRequires:  fdupes
 BuildRequires:  gmp-devel
 BuildRequires:  lzma-devel
 BuildRequires:  netcfg
-%if 0%{?suse_version} == 1315
+%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
 BuildRequires:  saltbundle-openssl-devel
 %else
 BuildRequires:  openssl-devel
@@ -237,14 +238,20 @@ BuildRequires:  python3-python-docs-them
 BuildRequires:  appstream-glib
 BuildRequires:  update-desktop-files
 %endif
+%if 0%{?suse_version} == 1110
+BuildRequires:  gcc48-c++
+%else
 BuildRequires:  gcc-c++
+%endif
 BuildRequires:  gdbm-devel
 BuildRequires:  gettext
 BuildRequires:  readline-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  timezone
 BuildRequires:  pkgconfig(ncurses)
+%if %{with tk}
 BuildRequires:  pkgconfig(tk)
+%endif
 BuildRequires:  pkgconfig(x11)
 %if "%_vendor" == "debbuild"
 Requires:       %{python_pkg_name}-base >= %{_version}-~
@@ -375,9 +382,13 @@ Requires:       libexpat1
 %if 0%{?debian} == 12
 Requires:       libffi8
 %endif
-%if 0%{?suse_version} == 1315
+%if 0%{?suse_version} <= 1315
+%if 0%{?suse_version} == 1110
+Requires:       libopenssl1_1
+%else
 Requires:       saltbundle-libopenssl1_0_0
 %endif
+%endif
 Requires:       %{python_libs_pkg_name} = %{version}
 %if 0%{?centos_version} != 700
 %if "%_vendor" == "debbuild"
@@ -524,7 +535,7 @@ other applications.
 %patch41 -p1
 %patch100 -p1
 
-%if 0%{?centos} == 7 || 0%{?debian} == 9 || 0%{?suse_version} == 1315 || 0%{?suse_version} == 1500
+%if 0%{?centos} == 7 || 0%{?debian} == 9 || 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315 || 0%{?suse_version} == 1500
 %patch111 -p1
 %patch112 -p1
 %endif
@@ -582,6 +593,12 @@ sed -e 's/-fprofile-correction//' -i Mak
 
 export CFLAGS="%{optflags} -IVendor/"
 
+%if 0%{?suse_version} == 1110
+export CC=gcc-4.8
+export CXX=g++-4.8
+export C_INCLUDE_PATH="/usr/include/ncurses/:$C_INCLUDE_PATH"
+%endif
+
 %configure \
     --with-platlibdir=%{_lib} \
     --docdir=%{_docdir}/python \
@@ -618,8 +635,10 @@ LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \
 %endif
 %endif
 
-%if %{with test}
 %check
+# Perform very dummy test at least to identify if ssl module is loadable
+LD_LIBRARY_PATH=. ./python -c 'import ssl; context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)'
+%if %{with test}
 %if %{with general}
 # exclude test_gdb -- it doesn't run in buildservice anyway, and fails on missing debuginfos
 # when you install gdb into your test env
@@ -937,6 +956,9 @@ rm -fv %{buildroot}%{sitedir}/lib-dynloa
 %if ! 0%{?openEuler} > 0
 %{dynlib nis}
 %endif
+%if !%{with tk}
+%exclude %{sitedir}/tkinter
+%endif
 
 %if %{with idle}
 %files -n %{python_pkg_name}-idle
@@ -1173,5 +1195,8 @@ sed -e 's,__PYTHONPREFIX__,%{python_pkg_
 %attr(755, root, root) %{_bindir}/python%{python_version}
 # endif for if base
 %endif
+%if !%{with tk}
+%exclude %{sitedir}/tkinter
+%endif
 
 %changelog

Places

File project.diff of Package saltbundlepy (Revision 4fb85cfdd7ab09b7e6d44ccc673361f6)

Places