From 3ed665b643ff3d54bed1180d403291fc26f0bcf3 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 06:13:34 +0100 Subject: [PATCH] move arch .so library from python-libxml2-py3 to libxml2 to ease PackageKit upgrade; remove and obsolete python 2.7 package [release 2.10.4-3mamba;Fri Oct 06 2023] --- libxml2.spec | 51 +++++++++++++-------------------------------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/libxml2.spec b/libxml2.spec index f5d2862..4003505 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f 1-2) Name: libxml2 Version: 2.10.4 -Release: 1mamba +Release: 3mamba Summary: Library providing XML and HTML support Group: System/Libraries Vendor: openmamba @@ -14,14 +14,15 @@ License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: liblzma-devel -BuildRequires: libpython27-devel -BuildRequires: libpython3-devel +BuildRequires: libpython311-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END +BuildRequires: python3-devel >= 3.11.5-3mamba %if "%{stage1}" != "1" BuildRequires: gtk-doc %endif BuildRequires: ldconfig +Obsoletes: python-libxml2-py27 <= 2.10.4-2mamba %description This library allows to manipulate XML files. @@ -56,15 +57,6 @@ Obsoletes: python-libxml2 =< 2.9.10-3mamba %description -n python-libxml2-py3 Python support for libxml2. -%package -n python-libxml2-py27 -Group: System/Libraries -Summary: Python support for %{name} -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -%py27_requires - -%description -n python-libxml2-py27 -Python support for libxml2. - %package utils Group: Development/Libraries Summary: Utilities for the libxml library providing XML and HTML support @@ -104,18 +96,12 @@ cp -a python python27 --disable-gtk-doc %endif -%make PYTHON_SITE_PACKAGES=%{python3_sitearch} +%make #make tests -%if "%{stage1}" != "1" -cd python27 -CFLAGS="%{optflags}" %{__python27} setup.py build -cd .. -%endif - %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%makeinstall PYTHON_SITE_PACKAGES=%{python3_sitearch} +%makeinstall #install AUTHORS COPYING Copyright NEWS README TODO* \ # %{buildroot}%{_datadir}/doc/%{name}-%{version}/ @@ -123,18 +109,6 @@ cd .. install -d -m 0755 %{buildroot}%{_sysconfdir}/sgml install -d -m 0755 %{buildroot}%{_sysconfdir}/xml -%if "%{stage1}" != "1" -cd python27 -%{__python27} setup.py install \ - -O1 --skip-build \ - --root="%{buildroot}" \ - --install-headers=%{python27_inc} \ - --install-lib=%{python27_sitearch} \ - --record=%{name}.filelist - -sed -i "s,.*/man/.*,&.gz," %{name}.filelist -%endif - %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -146,6 +120,7 @@ sed -i "s,.*/man/.*,&.gz," %{name}.filelist %dir %{_sysconfdir}/sgml %dir %{_sysconfdir}/xml %{_libdir}/libxml2.so.* +%{python3_sitearch}/libxml2mod.so %doc Copyright %files devel @@ -172,15 +147,9 @@ sed -i "s,.*/man/.*,&.gz," %{name}.filelist %if "%{stage1}" != "1" %files -n python-libxml2-py3 %defattr(-,root,root) -%{python3_sitearch}/libxml2* %{python3_sitelib}/__pycache__/*.pyc %{python3_sitelib}/drv_libxml2.py %{python3_sitelib}/libxml2.py - -%files -n python-libxml2-py27 -%defattr(-,root,root) -%{python27_sitearch}/libxml2* -%{python27_sitearch}/drv_libxml2.py* %endif %files apidocs @@ -193,6 +162,12 @@ sed -i "s,.*/man/.*,&.gz," %{name}.filelist %endif %changelog +* Fri Oct 06 2023 Silvan Calarco 2.10.4-3mamba +- move arch .so library from python-libxml2-py3 to libxml2 to ease PackageKit upgrade; remove and obsolete python 2.7 package + +* Tue Sep 26 2023 Automatic Build System 2.10.4-2mamba +- rebuilt by autoport with build requirements: python3-devel>=3.11.5-3mamba + * Wed Apr 12 2023 Automatic Build System 2.10.4-1mamba - automatic version update by autodist