Request 6255 (accepted)

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -63,8 +63,14 @@
 %endif
 #
 %bcond_without kodi_libbluray
-# 
+#
 %bcond_without systemd
+#
+%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
+%define python_version	3.13
+%else
+%define python_version	3.11
+%endif
 
 ExclusiveArch: does-not-build
 
@@ -132,13 +138,8 @@
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(fstrcmp)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-BuildRequires:  python(abi) >= 3.13
-BuildRequires:  pkgconfig(python-3.13)
-%else
-BuildRequires:  python(abi) >= 3.11
-BuildRequires:  pkgconfig(python-3.11)
-%endif
+BuildRequires:  python(abi) >= %{python_version}
+BuildRequires:  pkgconfig(python-%{python_version})
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass) >= 0.17.0
 BuildRequires:  pkgconfig(libcurl)
@@ -158,7 +159,7 @@
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3) 
+BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
@@ -371,7 +372,7 @@
 %build
 
 # Remove build time references so build-compare can do its work
-date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE 
+date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
@@ -444,11 +445,7 @@
     -DAPP_RENDER_SYSTEM=gl \
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-    -DPYTHON_VER=3.13 \
-%else
-    -DPYTHON_VER=3.11 \
-%endif
+    -DPYTHON_VER=%{python_version} \
 %if %{with kodi_without_pipewire}
     -DENABLE_PIPEWIRE=OFF \
 %endif
@@ -531,7 +528,7 @@
 
 %files
 %defattr(-,root,root)
-%doc version.txt 
+%doc version.txt
 %if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %endif

kodi-noX-raspberry-pi2.spec Changed

@@ -63,8 +63,14 @@
 %endif
 #
 %bcond_without kodi_libbluray
-# 
+#
 %bcond_without systemd
+#
+%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
+%define python_version	3.13
+%else
+%define python_version	3.11
+%endif
 
 ExclusiveArch: does-not-build
 
@@ -132,13 +138,8 @@
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(fstrcmp)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-BuildRequires:  python(abi) >= 3.13
-BuildRequires:  pkgconfig(python-3.13)
-%else
-BuildRequires:  python(abi) >= 3.11
-BuildRequires:  pkgconfig(python-3.11)
-%endif
+BuildRequires:  python(abi) >= %{python_version}
+BuildRequires:  pkgconfig(python-%{python_version})
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass) >= 0.17.0
 BuildRequires:  pkgconfig(libcurl)
@@ -158,7 +159,7 @@
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3) 
+BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
@@ -371,7 +372,7 @@
 %build
 
 # Remove build time references so build-compare can do its work
-date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE 
+date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
@@ -444,11 +445,7 @@
     -DAPP_RENDER_SYSTEM=gl \
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-    -DPYTHON_VER=3.13 \
-%else
-    -DPYTHON_VER=3.11 \
-%endif
+    -DPYTHON_VER=%{python_version} \
 %if %{with kodi_without_pipewire}
     -DENABLE_PIPEWIRE=OFF \
 %endif
@@ -531,7 +528,7 @@
 
 %files
 %defattr(-,root,root)
-%doc version.txt 
+%doc version.txt
 %if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %endif

kodi-noX.spec Changed

@@ -63,8 +63,14 @@
 %endif
 #
 %bcond_without kodi_libbluray
-# 
+#
 %bcond_without systemd
+#
+%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
+%define python_version	3.13
+%else
+%define python_version	3.11
+%endif
 
 ExclusiveArch: does-not-build
 
@@ -132,13 +138,8 @@
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(fstrcmp)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-BuildRequires:  python(abi) >= 3.13
-BuildRequires:  pkgconfig(python-3.13)
-%else
-BuildRequires:  python(abi) >= 3.11
-BuildRequires:  pkgconfig(python-3.11)
-%endif
+BuildRequires:  python(abi) >= %{python_version}
+BuildRequires:  pkgconfig(python-%{python_version})
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass) >= 0.17.0
 BuildRequires:  pkgconfig(libcurl)
@@ -158,7 +159,7 @@
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3) 
+BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
@@ -371,7 +372,7 @@
 %build
 
 # Remove build time references so build-compare can do its work
-date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE 
+date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
@@ -444,11 +445,7 @@
     -DAPP_RENDER_SYSTEM=gl \
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-    -DPYTHON_VER=3.13 \
-%else
-    -DPYTHON_VER=3.11 \
-%endif
+    -DPYTHON_VER=%{python_version} \
 %if %{with kodi_without_pipewire}
     -DENABLE_PIPEWIRE=OFF \
 %endif
@@ -531,7 +528,7 @@
 
 %files
 %defattr(-,root,root)
-%doc version.txt 
+%doc version.txt
 %if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %endif

kodi.spec Changed

@@ -63,8 +63,14 @@
 %endif
 #
 %bcond_without kodi_libbluray
-# 
+#
 %bcond_without systemd
+#
+%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
+%define python_version	3.13
+%else
+%define python_version	3.11
+%endif
 
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
@@ -132,13 +138,8 @@
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(fstrcmp)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-BuildRequires:  python(abi) >= 3.13
-BuildRequires:  pkgconfig(python-3.13)
-%else
-BuildRequires:  python(abi) >= 3.11
-BuildRequires:  pkgconfig(python-3.11)
-%endif
+BuildRequires:  python(abi) >= %{python_version}
+BuildRequires:  pkgconfig(python-%{python_version})
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass) >= 0.17.0
 BuildRequires:  pkgconfig(libcurl)
@@ -158,7 +159,7 @@
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3) 
+BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
@@ -371,7 +372,7 @@
 %build
 
 # Remove build time references so build-compare can do its work
-date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE 
+date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
@@ -444,11 +445,7 @@
     -DAPP_RENDER_SYSTEM=gl \
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-    -DPYTHON_VER=3.13 \
-%else
-    -DPYTHON_VER=3.11 \
-%endif
+    -DPYTHON_VER=%{python_version} \
 %if %{with kodi_without_pipewire}
     -DENABLE_PIPEWIRE=OFF \
 %endif
@@ -531,7 +528,7 @@
 
 %files
 %defattr(-,root,root)
-%doc version.txt 
+%doc version.txt
 %if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %endif

Overview

Request 6255 (accepted)

Request History