diff --git a/.gitignore b/.gitignore index b302393..a12ffc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/talloc-2.4.1.tar.gz +SOURCES/talloc-2.4.2.tar.gz SOURCES/talloc.keyring diff --git a/.libtalloc.metadata b/.libtalloc.metadata index 616c1d0..b55a0c9 100644 --- a/.libtalloc.metadata +++ b/.libtalloc.metadata @@ -1,2 +1,2 @@ -235cba1b89f265f0e7745d03c280199c8f1711e3 SOURCES/talloc-2.4.1.tar.gz +775ee0798f23bf13cd8dc3df1742fff7648d6052 SOURCES/talloc-2.4.2.tar.gz 182bae75e48aca2e5d40cd13d93d31b4443bd06d SOURCES/talloc.keyring diff --git a/SOURCES/talloc-2.4.1.tar.asc b/SOURCES/talloc-2.4.1.tar.asc deleted file mode 100644 index 0564147..0000000 --- a/SOURCES/talloc-2.4.1.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmS5ENkACgkQR5ORYRMI -QCWf8Af/WlOBXNzd6BBhku1mF75Sfnjzr0FNxWlFWrf9vbVH3HVrbCVNo3Rb7Llt -SfhaeXY99EsWyCOCMB4+2CI4dHNCRg6zvDNUcZgIgQG3nFWOHa8RYOZhVbDTbf2u -UPZTAXypv08rlNiqClP+sw07JIGeAumqKrwEtFuUEmwIF4ymXSnvVNpp5NJYiYlA -4XnQdH25ud4/rb5jkiLY/54zkLaEoAADb1MJqRSs0FEm6jT85rl2K9Y+n8ATsMan -+P6F1f8b6+bMJmWXR/1+AzlXTJjmJ2lHrs8CmffD0rO5bzOKBVOFvWmgM3cpsiA2 -OnBQZKM6RTUChcZAZHXBC+1iqfo5Kg== -=VFin ------END PGP SIGNATURE----- diff --git a/SOURCES/talloc-2.4.2.tar.asc b/SOURCES/talloc-2.4.2.tar.asc new file mode 100644 index 0000000..54f023f --- /dev/null +++ b/SOURCES/talloc-2.4.2.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmW3z9IACgkQR5ORYRMI +QCV/wQf/Q1xrEKBqph8qZznb2/RTt7qd6aGS7A8DZL9prPRD4yHHBYOx6ve0+j54 +faUmK9SY31FOGh6P78H51VmoNkKDZzSlUbO+rVx8FSJSHLC44BSPy4KvmJ+ZsLdM +ma5QeFm/CiMn821tQTs0A3ul80yjf6ur/gsu59X2qVX9ErmDIvUh3Z0TNzN367kx +kWdcC30qhth+T9662yp1SM/wE11IcSLvdsFm44GaZo5fhoDm59UaYQhUfj+c2Zhr +qaUuctmbxnpvNnSPYKK4j2II8fOGjANvXvtfpVWtdlm1IRMzZOgdWtLYqxwQMxxF +k7PGxr7ijIZoeYTq+KOBBq4zEk8b8Q== +=YnJL +-----END PGP SIGNATURE----- diff --git a/SPECS/libtalloc.spec b/SPECS/libtalloc.spec index 9e34d28..1bf983f 100644 --- a/SPECS/libtalloc.spec +++ b/SPECS/libtalloc.spec @@ -1,11 +1,5 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -%bcond_without python3 -%else -%bcond_with python3 -%endif - Name: libtalloc -Version: 2.4.1 +Version: 2.4.2 Release: 1%{?dist} Summary: The talloc library License: LGPL-3.0-or-later @@ -15,15 +9,11 @@ Source0: https://www.samba.org/ftp/talloc/talloc-%{version}.tar.gz Source1: https://www.samba.org/ftp/talloc/talloc-%{version}.tar.asc Source2: https://download.samba.org/pub/samba/samba-pubkey.asc#/talloc.keyring -# Patches - BuildRequires: make BuildRequires: gcc BuildRequires: libxslt BuildRequires: docbook-style-xsl -%if %{with python3} BuildRequires: python3-devel -%endif BuildRequires: doxygen BuildRequires: gnupg2 @@ -41,7 +31,6 @@ Requires: libtalloc = %{version}-%{release} %description devel Header files needed to develop programs that link against the Talloc library. -%if %{with python3} %package -n python3-talloc Summary: Python bindings for the Talloc library Requires: libtalloc = %{version}-%{release} @@ -57,15 +46,12 @@ Requires: python3-talloc = %{version}-%{release} %description -n python3-talloc-devel Development libraries for python3-talloc -%endif %prep %autosetup -n talloc-%{version} -p1 %build zcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} - -# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1217376 -export python_LDFLAGS="" %configure --disable-rpath \ --disable-rpath-install \ @@ -95,7 +81,6 @@ cp -a doc/man/man3 %{buildroot}%{_mandir} %{_mandir}/man3/talloc*.3* %{_mandir}/man3/libtalloc*.3* -%if %{with python3} %files -n python3-talloc %{_libdir}/libpytalloc-util.cpython*.so.* %{python3_sitearch}/talloc.cpython*.so @@ -104,15 +89,14 @@ cp -a doc/man/man3 %{buildroot}%{_mandir} %{_includedir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.cpython-*.pc %{_libdir}/libpytalloc-util.cpython*.so -%endif %ldconfig_scriptlets - -%if %{with python3} %ldconfig_scriptlets -n python3-talloc -%endif %changelog +* Wed Apr 24 2024 Pavel Filipenský - 2.4.2-1 +- resolves: RHEL-33758 - Rebase to version 2.4.2 + * Thu Nov 30 2023 Andreas Schneider - 2.4.1-1 - resolves: RHEL-16479 - Rebase to version 2.4.1