Accepting request 1295469 from hardware

OBS-URL: https://build.opensuse.org/request/show/1295469
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libplist?expand=0&rev=41

0001-cython-Fix-build-with-cython-3.1.patch

@@ -0,0 +1,25 @@
+From d7fe479707af57aeedf7e41c08e7fb698cd2e2a3 Mon Sep 17 00:00:00 2001
+From: Nikias Bassen <nikias@gmx.li>
+Date: Tue, 13 May 2025 18:32:50 +0200
+Subject: [PATCH 1/6] cython: Fix build with cython 3.1+
+
+---
+ cython/plist.pyx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cython/plist.pyx b/cython/plist.pyx
+index b5f4ef6..4d1f8aa 100644
+--- a/cython/plist.pyx
++++ b/cython/plist.pyx
+@@ -851,7 +851,7 @@ cdef plist_t native_to_plist_t(object native):
+         return plist_new_string(native)
+     if isinstance(native, bool):
+         return plist_new_bool(<bint>native)
+-    if isinstance(native, int) or isinstance(native, long):
++    if isinstance(native, int):
+         return plist_new_uint(native)
+     if isinstance(native, float):
+         return plist_new_real(native)
+-- 
+2.39.5
+

libplist.changes

@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Thu Jul 24 07:58:52 UTC 2025 - Ana Guerrero <ana.guerrero@suse.com>
+
+- Fix build with cython 3.1+:
+  * Add patch 0001-cython-Fix-build-with-cython-3.1.patch
+
+-------------------------------------------------------------------
+Wed Feb 26 13:38:14 UTC 2025 - Michal Suchanek <msuchanek@suse.de>
+
+- Fix Cython version requirement: Version 3.0 is required.
+
+-------------------------------------------------------------------
+Tue Feb 25 09:52:30 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix python singlespec usage: python_moudle should only ever be
+  used in BuildRequires statements.
+
+-------------------------------------------------------------------
+Mon Feb 24 08:21:44 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Build a proper python subpackage using python-rpm-macros
+  * uses python3 on Factory and python311 on SLE-15 derivatives
+
+-------------------------------------------------------------------
+Sat Feb 22 02:11:35 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
+
+- Update to version 2.6.0:
+  - Changes:
+  * Revert back API change around PLIST_DATA to use char* again
+  * Change API around PLIST_DATA to use uint8_t* instead of char*
+  * Add PLIST_DICT helper functions for different operations
+  * Require Cython 3.0 for python bindings
+  * Add a PLIST_OPT_NONE value to plist_write_options_t
+  * autoconf: Allow disabling build of test suite
+  * Update doxygen config and document undocumented macros
+  * Add an explicit PLIST_FORMAT_NONE value
+  * Add a libplist_version() function to the interface
+  * docs: Use README.md to generate mainpage with doxygen
+ - Bugfixes:
+  * Several compiler-related fixes and code improvements
+  * Plug memory leak in plist_write_to_stream()
+  * Prevent adding NULL items to array/dictionary nodes
+  * Fix parallel running of test suite
+  * Fix cython bindings
+  * Fix OOB read in plist_from_memory()
+
+-------------------------------------------------------------------
+Fri Nov 22 09:03:46 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- add setuptools buildrequires (needed for python 3.13)
+
 -------------------------------------------------------------------
 Mon Apr 24 10:50:09 UTC 2023 - Sebastian Wagner <sebix@sebix.at>
 
@@ -149,7 +200,7 @@ Wed Jan 25 15:39:22 UTC 2017 - i@marguerite.su
   * The base64decode function in base64.c allows attackers to
     obtaiin sensitive info from process memory or cause a denial
     of service (buffer over-read) via split encoded Apple Property
-    List data. 
+    List data.
 
 -------------------------------------------------------------------
 Tue Oct 21 22:40:00 UTC 2014 - m.szulecki@libimobiledevice.org
@@ -266,14 +317,14 @@ Sun Mar 20 18:17:36 CEST 2011 - opensuse@sukimashita.com
 -------------------------------------------------------------------
 Wed Dec  8 21:18:28 UTC 2010 - cristian.rodriguez@opensuse.org
 
-- Fix both -devel package dependencies and broken pkgconfig file 
+- Fix both -devel package dependencies and broken pkgconfig file
 
 -------------------------------------------------------------------
 Tue Apr 27 11:20:20 CEST 2010 - opensuse@sukimashita.com
 
 - Update to version 1.3
   * Endianness, alignment and type-punning fixes
-  * Fix armel floating point endianess 
+  * Fix armel floating point endianess
   * Allow compiling with mingw on Windows
   * Minor bugfixes
 

libplist.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libplist
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,22 +18,31 @@
 
 %define cname libplist-2_0-4
 %define cppname libplist++-2_0-4
+# only use primary python on Factory...
+%define pythons python3
+# ... and python311 on SLE 15 derivates
+%{?sle15_python_module_pythons}
 Name:           libplist
-Version:        2.3.0
+Version:        2.6.0
 Release:        0
 Summary:        Library for handling Apple Binary and XML Property Lists
 License:        GPL-2.0-only AND LGPL-2.1-or-later
 URL:            https://github.com/libimobiledevice/libplist
 Source:         https://github.com/libimobiledevice/libplist/archive/%{version}.tar.gz
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM https://github.com/libimobiledevice/libplist/commit/d7fe479707af57aeedf7e41c08e7fb698cd2e2a3
+Patch0:         0001-cython-Fix-build-with-cython-3.1.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-Cython >= 0.17
-BuildRequires:  pkgconfig(python3)
+BuildRequires:  %{python_module Cython >= 3.0}
+BuildRequires:  %{python_module base}
+BuildRequires:  %{python_module setuptools}
+%define python_subpackage_only 1
+%python_subpackages
 
 %description
 libplist is a library for handling Apple Binary and XML Property Lists.
@@ -84,14 +93,11 @@ libplist is a library for handling Apple Binary and XML Property Lists.
 
 This package contains the development files for C++.
 
-%package -n python3-plist
+%package -n python-plist
 Summary:        Library for handling Apple Binary and XML Property Lists -- Python Bindings
 Requires:       %{cname} = %{version}
-Requires:       python3-Cython >= 0.17
-Obsoletes:      python-plist < %{version}
-Conflicts:      python-plist
 
-%description -n python3-plist
+%description -n python-plist
 libplist is a library for handling Apple Binary and XML Property Lists.
 
 This package contains the python bindings.
@@ -101,7 +107,7 @@ This package contains the python bindings.
 
 %build
 autoreconf -fvi
-%configure --disable-static PACKAGE_VERSION=%{version}
+%{python_expand %configure --disable-static PACKAGE_VERSION=%{version} PYTHON=/usr/bin/python%{$python_bin_suffix}}
 %make_build
 
 %check
@@ -157,9 +163,9 @@ install -D -m 0644 cython/plist.pxd %{buildroot}%{_includedir}/plist/cython/plis
 %{_libdir}/libplist++-2.0.so
 %{_libdir}/pkgconfig/libplist++-2.0.pc
 
-%files -n python3-plist
+%files %{python_files plist}
 %dir %{_includedir}/plist/cython
 %{_includedir}/plist/cython/plist.pxd
-%{python3_sitearch}/plist.so
+%{python_sitearch}/plist.so
 
 %changelog