From a4490ca8169fc5bf3428901712f0a8773ef89a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 27 Jul 2015 17:08:05 +0200
Subject: [PATCH] Update to 2.1.3, introduce python3 subpackage, rename
 pytalloc to python-talloc

---
 .gitignore     |  1 +
 libtalloc.spec | 85 +++++++++++++++++++++++++++++++++++---------------
 sources        |  2 +-
 3 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34b816a..c8089ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /talloc-2.1.0.tar.gz
 /talloc-2.1.1.tar.gz
 /talloc-2.1.2.tar.gz
+/talloc-2.1.3.tar.gz
diff --git a/libtalloc.spec b/libtalloc.spec
index 5ed83e1..8b453c6 100644
--- a/libtalloc.spec
+++ b/libtalloc.spec
@@ -1,12 +1,6 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print(get_python_version())")}
-
 Name: libtalloc
-Version: 2.1.2
-Release: 2%{?dist}
+Version: 2.1.3
+Release: 1%{?dist}
 Group: System Environment/Daemons
 Summary: The talloc library
 License: LGPLv3+
@@ -17,14 +11,14 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
-BuildRequires: python-devel
+BuildRequires: python2-devel
+BuildRequires: python3-devel
 BuildRequires: doxygen
 
 Provides: bundled(libreplace)
 
 # Patches
 
-
 %description
 A library that implements a hierarchical allocator with destructors.
 
@@ -36,22 +30,43 @@ Requires: libtalloc = %{version}-%{release}
 %description devel
 Header files needed to develop programs that link against the Talloc library.
 
-%package -n pytalloc
+%package -n python-talloc
 Group: Development/Libraries
-Summary: Developer tools for the Talloc library
+Summary: Python bindings for the Talloc library
+Requires: libtalloc = %{version}-%{release}
+Provides: pytalloc%{?_isa} = %{version}-%{release}
+Provides: pytalloc = %{version}-%{release}
+Obsoletes: pytalloc < 2.1.3
+
+%description -n python-talloc
+Python libraries for creating bindings using talloc
+
+%package -n python-talloc-devel
+Group: Development/Libraries
+Summary: Development libraries for python-talloc
+Requires: python-talloc = %{version}-%{release}
+Provides: pytalloc-devel%{?_isa} = %{version}-%{release}
+Provides: pytalloc-devel = %{version}-%{release}
+Obsoletes: pytalloc-devel < 2.1.3
+
+%description -n python-talloc-devel
+Development libraries for python-talloc
+
+%package -n python3-talloc
+Group: Development/Libraries
+Summary: Python bindings for the Talloc library
 Requires: libtalloc = %{version}-%{release}
 
-%description -n pytalloc
-Pytalloc libraries for creating python bindings using talloc
+%description -n python3-talloc
+Python 3 libraries for creating bindings using talloc
 
-%package -n pytalloc-devel
+%package -n python3-talloc-devel
 Group: Development/Libraries
-Summary: Developer tools for the Talloc library
-Requires: pytalloc = %{version}-%{release}
-
-%description -n pytalloc-devel
-Development libraries for pytalloc
+Summary: Development libraries for python3-talloc
+Requires: python3-talloc = %{version}-%{release}
 
+%description -n python3-talloc-devel
+Development libraries for python3-talloc
 
 %prep
 %setup -q -n talloc-%{version}
@@ -61,7 +76,8 @@ Development libraries for pytalloc
            --disable-rpath-install \
            --bundled-libraries=NONE \
            --builtin-libraries=replace \
-           --disable-silent-rules
+           --disable-silent-rules \
+           --extra-python=%{__python3}
 
 make %{?_smp_mflags} V=1
 doxygen doxy.config
@@ -96,25 +112,44 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/talloc*.3.gz
 %{_mandir}/man3/libtalloc*.3.gz
 
-%files -n pytalloc
+%files -n python-talloc
 %defattr(-,root,root,-)
 %{_libdir}/libpytalloc-util.so.*
 %{python_sitearch}/talloc.so
 
-%files -n pytalloc-devel
+%files -n python-talloc-devel
 %defattr(-,root,root,-)
 %{_includedir}/pytalloc.h
 %{_libdir}/pkgconfig/pytalloc-util.pc
 %{_libdir}/libpytalloc-util.so
 
+%files -n python3-talloc
+%defattr(-,root,root,-)
+%{_libdir}/libpytalloc-util.cpython-%{python3_version_nodots}m.so.*
+%{python3_sitearch}/talloc.cpython-%{python3_version_nodots}m.so
+
+%files -n python3-talloc-devel
+%defattr(-,root,root,-)
+%{_includedir}/pytalloc.h
+%{_libdir}/pkgconfig/pytalloc-util.pc
+%{_libdir}/libpytalloc-util.cpython-%{python3_version_nodots}m.so
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%post -n pytalloc -p /sbin/ldconfig
-%postun -n pytalloc -p /sbin/ldconfig
+%post -n python-talloc -p /sbin/ldconfig
+%postun -n python-talloc -p /sbin/ldconfig
+
+%post -n python3-talloc -p /sbin/ldconfig
+%postun -n python3-talloc -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 22 2015 Jakub Hrozek <jhrozek@redhat.com> - 2.1.3-1
+- New upstream release - 2.1.3
+- Resolves: rhbz#1241928 - Switch libtalloc to use python3
+- Rename pytalloc to python-talloc (Miro Hrončok <mhroncok@redhat.com>)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 5fc78e6..884c03e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6bc6e6ac293e739a902dd73cdc88f664  talloc-2.1.2.tar.gz
+3e285de2228ae67ff0a0f5cec658f627  talloc-2.1.3.tar.gz