From befe9f61a0394eaec61ad4079d44c93f1d6fbfc304fd4dda7470004b5368c49f Mon Sep 17 00:00:00 2001 From: James McDonough Date: Sun, 1 Oct 2017 11:50:22 +0000 Subject: [PATCH] Accepting request 529900 from network:samba:TESTING 1 OBS-URL: https://build.opensuse.org/request/show/529900 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=94 --- sle11-remove-unknown-compiler-options.patch | 14 ------------ talloc-2.1.10.tar.asc | 11 +++++++++ talloc-2.1.10.tar.gz | 3 +++ talloc-2.1.9.tar.asc | 11 --------- talloc-2.1.9.tar.gz | 3 --- talloc-man.changes | 7 ++++++ talloc-man.spec | 25 +++++++++------------ talloc.changes | 7 ++++++ talloc.spec | 9 +++----- 9 files changed, 41 insertions(+), 49 deletions(-) delete mode 100644 sle11-remove-unknown-compiler-options.patch create mode 100644 talloc-2.1.10.tar.asc create mode 100644 talloc-2.1.10.tar.gz delete mode 100644 talloc-2.1.9.tar.asc delete mode 100644 talloc-2.1.9.tar.gz diff --git a/sle11-remove-unknown-compiler-options.patch b/sle11-remove-unknown-compiler-options.patch deleted file mode 100644 index 5285f53..0000000 --- a/sle11-remove-unknown-compiler-options.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: talloc-2.1.9/lib/replace/wscript -=================================================================== ---- talloc-2.1.9.orig/lib/replace/wscript -+++ talloc-2.1.9/lib/replace/wscript -@@ -706,8 +706,7 @@ def build(bld): - bld.SAMBA_SUBSYSTEM('replace-test', - source='''test/testsuite.c test/strptime.c - test/os2_delete.c test/getifaddrs.c''', -- deps='replace', -- cflags="-Wno-format-length") -+ deps='replace') - - if bld.env.standalone_replace: - bld.SAMBA_BINARY('replace_testsuite', diff --git a/talloc-2.1.10.tar.asc b/talloc-2.1.10.tar.asc new file mode 100644 index 0000000..17a403a --- /dev/null +++ b/talloc-2.1.10.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJZc9C2AAoJEEeTkWETCEAlH8YH/2/kD83vsMhKBg/s4WTgdRnM +CHEpxvo3O/3Qj2LxjZzSocfm2KtFraKCD7/fiPP3ZO7tSQwFS2P4HX44r+0ZWApy ++Vnah6rAf5wBlr+4oiPK6xTr4I6juPbSayEkTUMFVtVcF53/gsug7a72bmg0xDak +/gl6VHOptWpJu/VN4yPCd+Qx/7WyjvgRLXy9j5L9WLV12Fi++EGi8JzkK2aX+AMY +d1KXGExawm7Tgj4+Vw6b9XeW0H6g+x+a0WKWJC7hRUoaoVaq7b9UCNI3XXHDSBx7 +7mY0nb/XyHcA/m93k+qbpbOjbPaNnm6mvKqIJJWPjNd8gCK/DT7/DuFJi2FQrO8= +=oUDL +-----END PGP SIGNATURE----- diff --git a/talloc-2.1.10.tar.gz b/talloc-2.1.10.tar.gz new file mode 100644 index 0000000..988cad1 --- /dev/null +++ b/talloc-2.1.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619 +size 441645 diff --git a/talloc-2.1.9.tar.asc b/talloc-2.1.9.tar.asc deleted file mode 100644 index c6488ef..0000000 --- a/talloc-2.1.9.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJYtH6eAAoJEEeTkWETCEAlDWUH+QGzvnpnLxO2w/FIoXiqfgMf -NWtAuxp/Q99U8yzCcSxS1pPK2sB3k2aMvKp5Y6hadXAPnBt9+xknaoJXVfmaNznu -TJLdYhzRl9rhx2qc28AE1ArfetSLs/tTOlpU6upQXRMBTHD8Q0DxlC7PR2T8xqOa -vmzT6cDLaRyFhsnzPv5+7Ocrz9FTojSSzFmSimJKdIt7pkqfP79FKsH/U40m+Aea -ObNAG27OoKHI5023BTcTkCY0mrDhJq15MwLiLNTkj2OtBzO0TGTOFHFtaUplRrN+ -1uP8TBH9ANmXpjCH9+djv4sUyBWjRTUF0DGzmgax66wbrFkN3fGts6oJ2gDxTro= -=DGTK ------END PGP SIGNATURE----- diff --git a/talloc-2.1.9.tar.gz b/talloc-2.1.9.tar.gz deleted file mode 100644 index 8a80e30..0000000 --- a/talloc-2.1.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0aad4cb88a3322207c82136ddc07bed48a37c2c21f82962d6c5ccb422711062 -size 440335 diff --git a/talloc-man.changes b/talloc-man.changes index a6ebb09..418ecb1 100644 --- a/talloc-man.changes +++ b/talloc-man.changes @@ -1,3 +1,10 @@ + +------------------------------------------------------------------- +Wed Jul 26 09:01:56 UTC 2017 - scabrero@suse.com + +- Update to version 2.1.10 + + build, documentation and python3 improvements + ------------------------------------------------------------------- Wed Mar 22 16:51:46 UTC 2017 - jmcdonough@suse.com diff --git a/talloc-man.spec b/talloc-man.spec index 61f67b9..c60215d 100644 --- a/talloc-man.spec +++ b/talloc-man.spec @@ -52,7 +52,7 @@ BuildRequires: python3-devel %endif %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.9 +Version: 2.1.10 Release: 0 PreReq: /sbin/ldconfig Summary: Samba talloc Library @@ -73,17 +73,12 @@ It is the core memory allocator used in Samba. %if ! %{build_man} -%if 0%{?suse_version} > 0 -%define libtalloc_name libtalloc2 -%else -%define libtalloc_name libtalloc -%endif -%package -n %{libtalloc_name} +%package -n libtalloc2 Summary: Libraries and Header Files to Develop Programs with talloc2 Support Group: System/Libraries Provides: bundled(libreplace) -%description -n %{libtalloc_name} +%description -n libtalloc2 Talloc is a hierarchical, reference counted memory pool system with destructors. @@ -94,12 +89,12 @@ This package includes the talloc2 library. %package -n libtalloc-devel Summary: Libraries and Header Files to Develop Programs with talloc2 Support -Group: Development/Libraries/C and C++ # Man pages are built in a 2nd spec file in order to break a build cycle with doxygen->cmake->krb5->libtalloc +Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1030 Recommends: %{name}-man %endif -Requires: %{libtalloc_name} = %{version} +Requires: libtalloc2 = %{version} %if 0%{?suse_version} > 1020 Requires: pkg-config %else @@ -118,7 +113,7 @@ Libraries and Header Files to Develop Programs with talloc2 Support %package -n python-talloc Summary: Python bindings for the Talloc library Group: Development/Libraries/Python -Requires: %{libtalloc_name} = %{version} +Requires: libtalloc2 = %{version} PreReq: /sbin/ldconfig Provides: pytalloc = %{version} Obsoletes: pytalloc < %{version} @@ -148,7 +143,7 @@ Libraries and Header Files to Develop Programs with python-talloc Support %package -n python3-talloc Summary: Python3 bindings for the Talloc library Group: Development/Libraries/Python -Requires: %{libtalloc_name} = %{version} +Requires: libtalloc2 = %{version} PreReq: /sbin/ldconfig %description -n python3-talloc @@ -230,9 +225,9 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} %endif # ! build_man %if ! %{build_man} -%post -n %{libtalloc_name} -p /sbin/ldconfig +%post -n libtalloc2 -p /sbin/ldconfig -%postun -n %{libtalloc_name} -p /sbin/ldconfig +%postun -n libtalloc2 -p /sbin/ldconfig %post -n python-talloc -p /sbin/ldconfig @@ -244,7 +239,7 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} %postun -n python3-talloc -p /sbin/ldconfig %endif -%files -n %{libtalloc_name} +%files -n libtalloc2 %defattr(-,root,root) %{_libdir}/libtalloc.so.* diff --git a/talloc.changes b/talloc.changes index 9672f86..c2db8b3 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,10 @@ + +------------------------------------------------------------------- +Wed Jul 26 08:58:20 UTC 2017 - scabrero@suse.com + +- Update to version 2.1.10 + + build, documentation and python3 improvements + ------------------------------------------------------------------- Thu Mar 23 20:45:20 UTC 2017 - jmcdonough@suse.com diff --git a/talloc.spec b/talloc.spec index 9db6342..f30d263 100644 --- a/talloc.spec +++ b/talloc.spec @@ -52,7 +52,7 @@ BuildRequires: python3-devel %endif %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.9 +Version: 2.1.10 Release: 0 PreReq: /sbin/ldconfig Summary: Samba talloc Library @@ -62,7 +62,6 @@ Source: http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz Source1: http://download.samba.org/pub/talloc/talloc-%{version}.tar.asc Source4: baselibs.conf Patch0: talloc-python3.5-fix-soabi_name.patch -Patch1: sle11-remove-unknown-compiler-options.patch Source50: talloc.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,8 +94,8 @@ This package includes the talloc2 library. %package -n libtalloc-devel Summary: Libraries and Header Files to Develop Programs with talloc2 Support -Group: Development/Libraries/C and C++ # Man pages are built in a 2nd spec file in order to break a build cycle with doxygen->cmake->krb5->libtalloc +Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1030 Recommends: %{name}-man %endif @@ -176,9 +175,6 @@ Libraries and Header Files to Develop Programs with python3-talloc Support %prep %setup -n talloc-%{version} -q %patch0 -p1 -%if 0%{?suse_version} < 1200 -%patch1 -p1 -%endif %build %if ! %{build_man} @@ -283,6 +279,7 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} %defattr(-,root,root) %{_includedir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.pc +%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc %{_libdir}/libpytalloc-util.%{py3_soflags}.so %endif