.gitignore

@@ -1,2 +1 @@
-SOURCES/talloc-2.4.1.tar.gz
+SOURCES/talloc-2.2.0.tar.gz
-SOURCES/talloc.keyring

.libtalloc.metadata

@@ -1,2 +1 @@
-235cba1b89f265f0e7745d03c280199c8f1711e3 SOURCES/talloc-2.4.1.tar.gz
+d806e2e4e9b973e8ab6521d1dd20a03abae32c99 SOURCES/talloc-2.2.0.tar.gz
-182bae75e48aca2e5d40cd13d93d31b4443bd06d SOURCES/talloc.keyring

SOURCES/py3_abi.patch

@@ -0,0 +1,35 @@
+From 80be2141ffde6270f71f3f4ed4300762f8765c80 Mon Sep 17 00:00:00 2001
+From: Isaac Boukris <iboukris@gmail.com>
+Date: Mon, 25 Nov 2019 13:16:42 +0100
+Subject: [PATCH] ABI: add .PY3 alias to py{talloc,ldb} libs for backward
+ compatibility
+
+Signed-off-by: Isaac Boukris <iboukris@samba.org>
+---
+ buildtools/wafsamba/samba_abi.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: talloc-2.2.0/buildtools/wafsamba/samba_abi.py
+===================================================================
+--- talloc-2.2.0.orig/buildtools/wafsamba/samba_abi.py
++++ talloc-2.2.0/buildtools/wafsamba/samba_abi.py
+@@ -172,6 +172,10 @@ def abi_write_vscript(f, libname, curren
+         version
+     """
+ 
++    alias = None
++    if libname.startswith('PY') and libname.endswith('UTIL'):
++        alias = libname + '.PY3'
++
+     invmap = {}
+     for s in symmap:
+         invmap.setdefault(symmap[s], []).append(s)
+@@ -180,6 +184,8 @@ def abi_write_vscript(f, libname, curren
+     versions = sorted(versions, key=version_key)
+     for k in versions:
+         symver = "%s_%s" % (libname, k)
++        if alias:
++            symver = "%s_%s" % (alias, k)
+         if symver == current_version:
+             break
+         f.write("%s {\n" % symver)

SOURCES/talloc-2.4.1.tar.asc

@@ -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-----

SPECS/libtalloc.spec

@@ -1,48 +1,39 @@
-%if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
-
 Name: libtalloc
-Version: 2.4.1
+Version: 2.2.0
-Release: 0%{?dist}
+Release: 7%{?dist}
+Group: System Environment/Daemons
 Summary: The talloc library
-License: LGPL-3.0-or-later
+License: LGPLv3+
 URL: https://talloc.samba.org/
+Source: https://www.samba.org/ftp/talloc/talloc-%{version}.tar.gz
 
-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
 
 Provides: bundled(libreplace)
-Obsoletes: python2-talloc < 2.2.0-1
+Obsoletes: python2-talloc < %{version}-%{release}
-Obsoletes: python2-talloc-devel < 2.2.0-1
+Obsoletes: python2-talloc-devel < %{version}-%{release}
+Obsoletes: python2-talloc-debuginfo < %{version}-%{release}
+
+# Patches
+Patch0001: py3_abi.patch
 
 %description
 A library that implements a hierarchical allocator with destructors.
 
 %package devel
+Group: Development/Libraries
 Summary: Developer tools for the Talloc library
 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
+Group: Development/Libraries
 Summary: Python bindings for the Talloc library
 Requires: libtalloc = %{version}-%{release}
 %{?python_provide:%python_provide python3-talloc}
@@ -51,19 +42,19 @@ Requires: libtalloc = %{version}-%{release}
 Python 3 libraries for creating bindings using talloc
 
 %package -n python3-talloc-devel
+Group: Development/Libraries
 Summary: Development libraries for python3-talloc
 Requires: python3-talloc = %{version}-%{release}
 %{?python_provide:%python_provide python3-talloc-devel}
 
 %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=""
 
@@ -71,19 +62,27 @@ export python_LDFLAGS=""
            --disable-rpath-install \
            --bundled-libraries=NONE \
            --builtin-libraries=replace \
-           --disable-silent-rules
+           --disable-silent-rules \
+           $PY3_CONFIG_FLAGS
 
-%make_build
+make %{?_smp_mflags} V=1
 doxygen doxy.config
 
 %check
-%make_build check
+make %{?_smp_mflags} check
 
 %install
-%make_install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Shared libraries need to be marked executable for
+# rpmbuild to strip them and include them in debuginfo
+find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \;
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.a
+rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i
 
 # Install API docs
-cp -a doc/man/man3 %{buildroot}%{_mandir}
+cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
 
 %files
 %{_libdir}/libtalloc.so.*
@@ -92,10 +91,9 @@ cp -a doc/man/man3 %{buildroot}%{_mandir}
 %{_includedir}/talloc.h
 %{_libdir}/libtalloc.so
 %{_libdir}/pkgconfig/talloc.pc
-%{_mandir}/man3/talloc*.3*
+%{_mandir}/man3/talloc*.3.gz
-%{_mandir}/man3/libtalloc*.3*
+%{_mandir}/man3/libtalloc*.3.gz
 
-%if %{with python3}
 %files -n python3-talloc
 %{_libdir}/libpytalloc-util.cpython*.so.*
 %{python3_sitearch}/talloc.cpython*.so
@@ -104,42 +102,12 @@ 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 Nov 15 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.4.1-0
-- resolves: RHEL-16508 - Rebase to version 2.4.1
-
-* Tue Jun 06 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.4.0-3
-- resolves: rhbz#2190419 - Rebuild to trigger distrobaker sync
-
-* Wed May 24 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.4.0-2
-- resolves: rhbz#2190419 - Add missing tests to fix osci.brew-build.tier0.functional
-
-* Thu May 18 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.4.0-1
-- resolves: rhbz#2190419 - Rebase to version 2.4.0
-
-* Mon Oct 24 2022 Andreas Schneider <asn@redhat.com> - 2.3.4-1
-- resolves: rhbz#2132056 - Update to version 2.3.4
-
-* Thu Aug 11 2022 Andreas Schneider <asn@redhat.com> - 2.3.3-2
-- resolves: rhbz#2100088 - Rebuild to include python3-talloc-devel in CRB
-
-* Thu Nov 25 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.3.3-1
-- resolves: rhbz#2013601 - Update to version 2.3.3
-
-* Tue May 11 2021 Andreas Schneider <asn@redhat.com> - 2.3.2-1
-- resolves: rhbz#1945014 - Update to version 2.3.2
-
-* Tue Jun 2 2020 Isaac Boukris <iboukris@redhat.com> - 2.3.1-2
-- resolves: rhbz#1817560 - Update to version 2.3.1
-
 * Mon Nov 25 2019 Isaac Boukris <iboukris@redhat.com> - 2.2.0-7
 - related: rhbz#1754417 - Fix PY3 symbol names