diff --git a/baselibs.conf b/baselibs.conf index 6788f15..e1ce977 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,2 @@ libtdb1 -python-tdb python3-tdb diff --git a/ignore-tdb1-run-transaction-expand.diff b/ignore-tdb1-run-transaction-expand.diff index 35acbd9..0bc1274 100644 --- a/ignore-tdb1-run-transaction-expand.diff +++ b/ignore-tdb1-run-transaction-expand.diff @@ -5,7 +5,7 @@ Index: tdb-1.2.11/wscript =================================================================== --- tdb-1.2.11.orig/wscript +++ tdb-1.2.11/wscript -@@ -213,8 +213,9 @@ def testonly(ctx): +@@ -238,8 +238,9 @@ def testonly(ctx): if ret != 0: print("%s failed:" % f) samba_utils.RUN_COMMAND("cat " + os.path.join(testdir, 'test-output')) @@ -14,6 +14,6 @@ Index: tdb-1.2.11/wscript + if f != 'tdb1-run-transaction-expand': + ecode = ret; + break; - + if ecode == 0: - cmd = os.path.join(Utils.g_module.blddir, 'tdbtorture') + cmd = os.path.join(blddir, 'tdbtorture') diff --git a/tdb-1.3.16.tar.asc b/tdb-1.3.16.tar.asc deleted file mode 100644 index cc5f3a8..0000000 --- a/tdb-1.3.16.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAltG7QMVHHNhbWJhLWJ1 -Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlowMIAJMs9LpoVeHlnGsaGuX2+F4PLUzh -QrzLHwwH6yGOUlnZuFsHQ40POYb4xdFVaZ2SX6FWpYmIgx9qvCbiP7Om1J3Ff7hG -KnLm5a3X+bS5U2+Q3Opi+BCW36hNwwBGR3XMfST3TJq8p5tpBE+xDy2Wg+5uFhbW -etfrNHMpwVHdbgQx5rSpqqK2Bol1HDRsbz4790lnnrtxADlFvgknZErMXHKFuOP5 -YBfvCkgLDYP9SQRGbk1IkHMaFQBqpgjJG/8qPzs9G//sNZhhBtWk3wOObDg27GW3 -A7QJUGzvGnW+7qjf15yQ+kPiMLVbDe+pcLkWzdo3EZPZ0qhoBQJ1/8Uv3m8= -=Pl5Y ------END PGP SIGNATURE----- diff --git a/tdb-1.3.16.tar.gz b/tdb-1.3.16.tar.gz deleted file mode 100644 index 50957e4..0000000 --- a/tdb-1.3.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a3fc2616567f23993984ada3cea97d953a27669ffd1bfbbe961f26e0cf96cc5 -size 504330 diff --git a/tdb-1.3.18.tar.asc b/tdb-1.3.18.tar.asc new file mode 100644 index 0000000..488f7af --- /dev/null +++ b/tdb-1.3.18.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFIBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlx1Js8VHHNhbWJhLWJ1 +Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlt54H9RmNN+Q8jQS6rBG9fB1SNMaMsKUK +jS1hqSMgFwiR9k3Zk9qkYGRqpb23NNdkH/j/fSSRqTwsEQrnQrtxpAHZ05PR0fbN +OKHvpTXrC76UoEoAMWhEO//iMq0KjMVcUfDTobbWBAGlOavoEB74ajdQQms4tzbw +lsojE5CkgloBStfG7vx/B9Sgxyoyn1pTv8kaNuxA4RJhkODLLjl0HxorT+1AJPSI +bmLooAgNM8PYDxwxuiNVTww/wqTYGRCidHp83BqArfN5G5tfl4I5N5JXCaocf/Kr +kqphThrdV034sl8Za7G9YHJZNH4ZRk0PRj++LGuE2j0/3mSdn7c9//Vcew== +=n+Md +-----END PGP SIGNATURE----- diff --git a/tdb-1.3.18.tar.gz b/tdb-1.3.18.tar.gz new file mode 100644 index 0000000..119b503 --- /dev/null +++ b/tdb-1.3.18.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c156b40e88bc82a538893437cd763d26fbed5379871e0f7219fd021e60d336b7 +size 697970 diff --git a/tdb.changes b/tdb.changes index 7d4745e..953ac9a 100644 --- a/tdb.changes +++ b/tdb.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Mar 5 17:02:59 UTC 2019 - dmulder@suse.com + +- Update to 1.3.18 + + Fix build problems with older python versions. + + C99 build fixes. + + Fix standalone build of tdb. + +------------------------------------------------------------------- +Wed Jan 23 20:36:09 UTC 2019 - dmulder@suse.com + +- Update to 1.3.17 + ------------------------------------------------------------------- Tue Sep 25 07:36:48 UTC 2018 - Samuel Cabrero diff --git a/tdb.spec b/tdb.spec index 4a0e6bc..49b9969 100644 --- a/tdb.spec +++ b/tdb.spec @@ -1,7 +1,7 @@ # # spec file for package tdb # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,11 +18,6 @@ %{!?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: tdb BuildRequires: autoconf @@ -30,12 +25,9 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libxslt BuildRequires: pkg-config -BuildRequires: python-devel -%if %{with_python3} BuildRequires: python3-devel -%endif Url: https://tdb.samba.org/ -Version: 1.3.16 +Version: 1.3.18 Release: 0 Summary: Samba Trivial Database License: LGPL-3.0-or-later @@ -91,18 +83,11 @@ internally to keep writers from trampling on each other. This package contains tools to manage Tdb files. -%package -n python-tdb -Summary: Python bindings for the Tdb library -Group: Development/Libraries/Python -Requires: libtdb1 = %{version} - -%description -n python-tdb -This package contains the Python bindings for the Tdb library. - %package -n python3-tdb Summary: Python3 bindings for the Tdb library Group: Development/Libraries/Python Requires: libtdb1 = %{version} +Obsoletes: python-tdb %description -n python3-tdb This package contains the Python3 bindings for the Tdb library. @@ -123,9 +108,6 @@ CONFIGURE_OPTIONS="\ --disable-rpath-install \ --disable-silent-rules \ --bundled-libraries=NONE \ -%if %{with_python3} - --extra-python=/usr/bin/python3 \ -%endif " ./configure ${CONFIGURE_OPTIONS} make %{?_smp_mflags} \ @@ -169,12 +151,6 @@ cp -a docs/man/man3/tdb.3 %{buildroot}/%{_mandir}/man3/ %{_mandir}/man8/tdbrestore.8* %{_mandir}/man8/tdbtool.8* -%files -n python-tdb -%defattr(-,root,root) -%{python_sitearch}/tdb.so -%{python_sitearch}/_tdb_text.py* - -%if %{with_python3} %files -n python3-tdb %defattr(-,root,root) %{python3_sitearch}/tdb.%{py3_soflags}.so @@ -182,6 +158,5 @@ cp -a docs/man/man3/tdb.3 %{buildroot}/%{_mandir}/man3/ %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 %{python3_sitearch}/__pycache__/_tdb_text.cpython-*.py[co] %endif -%endif %changelog