diff --git a/baselibs.conf b/baselibs.conf index a7749dc..fe100ae 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ libtalloc2 -pytalloc +python-talloc + obsoletes "pytalloc- < " +python3-talloc diff --git a/talloc-2.1.3.tar.asc b/talloc-2.1.3.tar.asc deleted file mode 100644 index abea162..0000000 --- a/talloc-2.1.3.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJVrqzVAAoJEEeTkWETCEAlhhkH/1GSPiSGX4bYK35gbwoTneM3 -WMpDme6f8FcYo1Ha0qk8iz9SnC4GPPOvxYcOQhFoUOktsdMuggTFXu8sHpWZDFP0 -K3wk/HIdNMGKibzDdzTX33gAdzKQmx+jrxdx7LBAKGi5pzplU5wCL3fT0g7N0x/K -vr1VCv+jm8/ZP61ug8e87bj4Mp8G+K7IxpNNfBcA3oPovWTHGXHS+XWzCVz5QAO+ -XpykS8oYhJpckPKvt1mOneA5NnIlCna1f+QBrQ2LrD5zxNQ8EIyniE80/qMV73Vt -hdbN8voz+yWpquPL/NkUS6Pn8yW02x4ogPQaYQZ7G0Zc2mPAsGcIB14ZV5zuMRo= -=a2Xo ------END PGP SIGNATURE----- diff --git a/talloc-2.1.3.tar.gz b/talloc-2.1.3.tar.gz deleted file mode 100644 index 95e641c..0000000 --- a/talloc-2.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7aa5f75b22d4ef9c737b25515f2a2837ddc13014ff4ac6e58dd9e311f41f2cb0 -size 434093 diff --git a/talloc-2.1.4.tar.asc b/talloc-2.1.4.tar.asc new file mode 100644 index 0000000..27ade1b --- /dev/null +++ b/talloc-2.1.4.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJWHPgkAAoJEEeTkWETCEAlIHYH/05HT5ApifjPveJdFP2y9ERi +jWxd1i5orL8rOW3haIFUQlNFn2cwPzzZ4J7Vdhwfak0D0buPa2Z9NEbZix86QaCC +kolCMkpJLDDhTXPdFL9SbwTVS4OsX0ZePYhIYmadCUfafSSPZFxZ83GydpR03Wrn +ruFYwq+xBJEy76BZzXyERXo22rIyhLiCcF0P1Y7CmvQIYztTb9/aHbmCiNa2jimf +5QIZQLmvppIngrg4lllvz9QSws2PPLacS+yamQzDJiSVL0ZMt1zMXnS//tTPQXGK +o3rsH+QxApUtiq3O7n0YSZst3EZnIR0Ib+/Ah7Kz69cR2y1+FXeRpsDWfpox9yI= +=eAmL +-----END PGP SIGNATURE----- diff --git a/talloc-2.1.4.tar.gz b/talloc-2.1.4.tar.gz new file mode 100644 index 0000000..ecb51bc --- /dev/null +++ b/talloc-2.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aea04697a28d809054fb59c4c0b94912757037981dedbec1be47d09fe10749b3 +size 436552 diff --git a/talloc.changes b/talloc.changes index 6a9f919..8dde271 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Oct 24 21:19:20 UTC 2015 - lmuelle@suse.com + +- Add python3-talloc and python3-talloc-devel; (bsc#951911). + +------------------------------------------------------------------- +Thu Oct 22 20:41:47 UTC 2015 - lmuelle@suse.com + +- Rename pytalloc to python-talloc. + +------------------------------------------------------------------- +Thu Oct 22 18:07:41 UTC 2015 - lmuelle@suse.com + +- Update to 2.1.4; (bsc#951660). + + Test that talloc magic differs between processes. + + Increment minor version due to added talloc_test_get_magic. + + Provide tests access to talloc_magic. + + Test magic protection measures. + ------------------------------------------------------------------- Mon Sep 7 17:06:26 UTC 2015 - lmuelle@suse.com diff --git a/talloc.spec b/talloc.spec index ff30f15..2ebd245 100644 --- a/talloc.spec +++ b/talloc.spec @@ -17,6 +17,12 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?py3_soflags: %global py3_soflags cpython-%{python3_version_nodots}m} +%if 0%{?suse_version} > 1310 || 0%{?fedora_version} > 20 +%define with_python3 1 +%else +%define with_python3 0 +%endif Name: talloc %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 @@ -33,11 +39,14 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif BuildRequires: python-devel +%if %{with_python3} +BuildRequires: python3-devel +%endif %if 0%{?suse_version} > 1100 #!BuildIgnore: python %endif Url: http://talloc.samba.org/ -Version: 2.1.3 +Version: 2.1.4 Release: 0 PreReq: /sbin/ldconfig Summary: Samba talloc Library @@ -90,30 +99,61 @@ It is the core memory allocator used in Samba. Libraries and Header Files to Develop Programs with talloc2 Support -%package -n pytalloc +%package -n python-talloc Summary: Python bindings for the Talloc library Group: Development/Libraries/Python Requires: %{libtalloc_name} = %{version} PreReq: /sbin/ldconfig +Provides: pytalloc = %{version} +Obsoletes: pytalloc < %{version} -%description -n pytalloc +%description -n python-talloc This package contains the python bindings for the Talloc library. -%package -n pytalloc-devel +%package -n python-talloc-devel Summary: Developer tools for the Talloc library Group: Development/Libraries/Python -Requires: pytalloc = %{version} +Requires: python-talloc = %{version} %if 0%{?suse_version} > 1020 Requires: pkg-config %else Requires: pkgconfig %endif +Provides: pytalloc-devel = %{version} +Obsoletes: pytalloc-devel < %{version} +Conflicts: python3-talloc-devel -%description -n pytalloc-devel -Libraries and Header Files to Develop Programs with pytalloc Support +%description -n python-talloc-devel +Libraries and Header Files to Develop Programs with python-talloc Support +%if %{with_python3} +%package -n python3-talloc +Summary: Python3 bindings for the Talloc library +Group: Development/Libraries/Python +Requires: %{libtalloc_name} = %{version} +PreReq: /sbin/ldconfig + +%description -n python3-talloc +This package contains the python3 bindings for the Talloc library. + + +%package -n python3-talloc-devel +Summary: Developer tools for the Talloc library +Group: Development/Libraries/Python +Requires: python3-talloc = %{version} +%if 0%{?suse_version} > 1020 +Requires: pkg-config +%else +Requires: pkgconfig +%endif +Conflicts: python-talloc-devel + +%description -n python3-talloc-devel +Libraries and Header Files to Develop Programs with python3-talloc Support +%endif + %prep %setup -n talloc-%{version} -q @@ -131,6 +171,9 @@ CONFIGURE_OPTIONS="\ --disable-rpath \ --bundled-libraries=NONE \ --builtin-libraries=replace \ +%if %{with_python3} + --extra-python=/usr/bin/python3 \ +%endif " ./configure ${CONFIGURE_OPTIONS} %{__make} %{build_make_smp_mflags} \ @@ -147,9 +190,15 @@ DESTDIR=${RPM_BUILD_ROOT} make install %postun -n %{libtalloc_name} -p /sbin/ldconfig -%post -n pytalloc -p /sbin/ldconfig +%post -n python-talloc -p /sbin/ldconfig -%postun -n pytalloc -p /sbin/ldconfig +%postun -n python-talloc -p /sbin/ldconfig + +%if %{with_python3} +%post -n python3-talloc -p /sbin/ldconfig + +%postun -n python3-talloc -p /sbin/ldconfig +%endif %files -n %{libtalloc_name} %defattr(-,root,root) @@ -164,15 +213,28 @@ DESTDIR=${RPM_BUILD_ROOT} make install %{_mandir}/man3/talloc.3* %endif -%files -n pytalloc +%files -n python-talloc %defattr(-,root,root) %{_libdir}/libpytalloc-util.so.* %{python_sitearch}/talloc.so -%files -n pytalloc-devel -%defattr(-,root,root,-) +%files -n python-talloc-devel +%defattr(-,root,root) %{_includedir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.pc %{_libdir}/libpytalloc-util.so +%if %{with_python3} +%files -n python3-talloc +%defattr(-,root,root) +%{_libdir}/libpytalloc-util.%{py3_soflags}.so.* +%{python3_sitearch}/talloc.%{py3_soflags}.so + +%files -n python3-talloc-devel +%defattr(-,root,root) +%{_includedir}/pytalloc.h +%{_libdir}/pkgconfig/pytalloc-util.pc +%{_libdir}/libpytalloc-util.%{py3_soflags}.so +%endif + %changelog