From befe9f61a0394eaec61ad4079d44c93f1d6fbfc304fd4dda7470004b5368c49f Mon Sep 17 00:00:00 2001 From: James McDonough Date: Sun, 1 Oct 2017 11:50:22 +0000 Subject: [PATCH 1/4] 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 From 7380a56fe6eb7a943c82831b09fc43f6077273de84a6f32d8cb48c51de45ccdb Mon Sep 17 00:00:00 2001 From: James McDonough Date: Thu, 5 Oct 2017 10:39:08 +0000 Subject: [PATCH 2/4] Accepting request 531383 from home:StefanBruens:branches:network:samba:STABLE Correct changelog to allow submission to Factory (mention deleted patch as required) - Update to version 2.1.10 + build, documentation and python3 improvements + delete sle11-remove-unknown-compiler-options.patch, supported options are checked for in upstream code OBS-URL: https://build.opensuse.org/request/show/531383 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=95 --- talloc-man.changes | 2 ++ talloc.changes | 2 ++ 2 files changed, 4 insertions(+) diff --git a/talloc-man.changes b/talloc-man.changes index 418ecb1..dd22349 100644 --- a/talloc-man.changes +++ b/talloc-man.changes @@ -4,6 +4,8 @@ Wed Jul 26 09:01:56 UTC 2017 - scabrero@suse.com - Update to version 2.1.10 + build, documentation and python3 improvements + + delete sle11-remove-unknown-compiler-options.patch, supported + options are checked for in upstream code ------------------------------------------------------------------- Wed Mar 22 16:51:46 UTC 2017 - jmcdonough@suse.com diff --git a/talloc.changes b/talloc.changes index c2db8b3..1987301 100644 --- a/talloc.changes +++ b/talloc.changes @@ -4,6 +4,8 @@ Wed Jul 26 08:58:20 UTC 2017 - scabrero@suse.com - Update to version 2.1.10 + build, documentation and python3 improvements + + delete sle11-remove-unknown-compiler-options.patch, supported + options are checked for in upstream code ------------------------------------------------------------------- Thu Mar 23 20:45:20 UTC 2017 - jmcdonough@suse.com From 9cca738e8d3c144c6f091796ec4aa67c176c7f38066d63e0e2a55f350120f422 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Fri, 6 Oct 2017 08:26:58 +0000 Subject: [PATCH 3/4] Accepting request 531613 from home:jengelh:branches:network:samba:STABLE sle11sp4 now build-tested and verified OBS-URL: https://build.opensuse.org/request/show/531613 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=96 --- talloc-man.changes | 19 +++++++++- talloc-man.spec | 94 +++++++++++++++++----------------------------- talloc.changes | 6 +++ talloc.spec | 68 +++++++-------------------------- 4 files changed, 72 insertions(+), 115 deletions(-) diff --git a/talloc-man.changes b/talloc-man.changes index dd22349..72eef19 100644 --- a/talloc-man.changes +++ b/talloc-man.changes @@ -1,12 +1,24 @@ +------------------------------------------------------------------- +Mon Oct 2 12:18:30 UTC 2017 - jengelh@inai.de + +- Remove %if guards for blocks that do not affect the build result. + Fix RPM groups and summaries. Drop very old SUSE support. + Replace old RPM macros by new constructs. ------------------------------------------------------------------- -Wed Jul 26 09:01:56 UTC 2017 - scabrero@suse.com +Wed Jul 26 08:58:20 UTC 2017 - scabrero@suse.com - Update to version 2.1.10 + build, documentation and python3 improvements + delete sle11-remove-unknown-compiler-options.patch, supported options are checked for in upstream code +------------------------------------------------------------------- +Thu Mar 23 20:45:20 UTC 2017 - jmcdonough@suse.com + +- sle11-remove-unknown-compiler-options.patch: build SLE11 and earlier + without -Wno-format-length. + ------------------------------------------------------------------- Wed Mar 22 16:51:46 UTC 2017 - jmcdonough@suse.com @@ -47,6 +59,11 @@ Sun Feb 21 16:44:01 UTC 2016 - lmuelle@suse.com - Avoid a file collision for non SUSE build targets; (bsc#966174). +------------------------------------------------------------------- +Fri Feb 12 17:03:57 UTC 2016 - lmuelle@suse.com + +- Provide python-talloc and python-talloc-devel; (bsc#966523). + ------------------------------------------------------------------- Wed Nov 11 17:49:37 UTC 2015 - lmuelle@suse.com diff --git a/talloc-man.spec b/talloc-man.spec index c60215d..b6071a4 100644 --- a/talloc-man.spec +++ b/talloc-man.spec @@ -30,36 +30,24 @@ Name: talloc-man BuildRequires: doxygen %else Name: talloc -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 -%define build_make_smp_mflags %{?_smp_mflags} -%else -%define build_make_smp_mflags %{?jobs:-j%jobs} -%endif BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -%if 0%{?suse_version} > 1020 BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif BuildRequires: python-devel %if %{with_python3} BuildRequires: python3-devel %endif -%if 0%{?suse_version} > 1100 #!BuildIgnore: python -%endif %endif # build_man Url: http://talloc.samba.org/ Version: 2.1.10 Release: 0 -PreReq: /sbin/ldconfig Summary: Samba talloc Library License: LGPL-3.0+ -Group: System/Libraries -Source: https://download.samba.org/pub/talloc/talloc-%{version}.tar.gz -Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc +Group: Development/Libraries/C and C++ +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 Source50: talloc.keyring @@ -73,12 +61,17 @@ It is the core memory allocator used in Samba. %if ! %{build_man} -%package -n libtalloc2 -Summary: Libraries and Header Files to Develop Programs with talloc2 Support +%if 0%{?suse_version} > 0 +%define libtalloc_name libtalloc2 +%else +%define libtalloc_name libtalloc +%endif +%package -n %{libtalloc_name} +Summary: Samba talloc library Group: System/Libraries Provides: bundled(libreplace) -%description -n libtalloc2 +%description -n %{libtalloc_name} Talloc is a hierarchical, reference counted memory pool system with destructors. @@ -94,12 +87,8 @@ Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1030 Recommends: %{name}-man %endif -Requires: libtalloc2 = %{version} -%if 0%{?suse_version} > 1020 +Requires: %{libtalloc_name} = %{version} Requires: pkg-config -%else -Requires: pkgconfig -%endif %description -n libtalloc-devel Talloc is a hierarchical, reference counted memory pool system with @@ -107,30 +96,25 @@ destructors. It is the core memory allocator used in Samba. -Libraries and Header Files to Develop Programs with talloc2 Support +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: libtalloc2 = %{version} -PreReq: /sbin/ldconfig +Requires: %{libtalloc_name} = %{version} Provides: pytalloc = %{version} Obsoletes: pytalloc < %{version} %description -n python-talloc -This package contains the python bindings for the Talloc library. +This package contains the Python bindings for the Talloc library. %package -n python-talloc-devel Summary: Developer tools for the Talloc library Group: Development/Libraries/Python -Requires: python-talloc = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif +Requires: python-talloc = %{version} Provides: pytalloc-devel = %{version} Obsoletes: pytalloc-devel < %{version} Conflicts: python3-talloc-devel @@ -143,22 +127,17 @@ 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: libtalloc2 = %{version} -PreReq: /sbin/ldconfig +Requires: %{libtalloc_name} = %{version} %description -n python3-talloc -This package contains the python3 bindings for the Talloc library. +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 +Requires: python3-talloc = %{version} Conflicts: python-talloc-devel %description -n python3-talloc-devel @@ -173,13 +152,7 @@ Libraries and Header Files to Develop Programs with python3-talloc Support %build %if ! %{build_man} -%if 0%{?suse_version} && 0%{?suse_version} < 911 - OPTIMIZATION="-O" -%else - # use the default optimization - unset OPTIMIZATION -%endif -export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" +export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -193,7 +166,7 @@ CONFIGURE_OPTIONS="\ %endif " ./configure ${CONFIGURE_OPTIONS} -%{__make} %{build_make_smp_mflags} \ +make %{?_smp_mflags} \ all %else @@ -205,41 +178,43 @@ doxygen doxy.config %if ! %{build_man} %check %if 0%{?suse_version} != 1110 || "%{_build_arch}" == x86_64 +%if "%{qemu_user_space_build}" == "1" +echo "skipping test on qemu userspace build due to AT_RANDOM not changing" +%else # qemu_user_space_build == 1 mkdir lib/talloc ln test_magic_differs* lib/talloc/ -LD_LIBRARY_PATH=bin/shared %{__make} test +LD_LIBRARY_PATH=bin/shared make test +%endif # qemu_user_space_build == 1 %endif # suse_version != 1110; fails for i586 and ppc64 %endif # ! build_man %install %if ! %{build_man} -DESTDIR=${RPM_BUILD_ROOT} make install -rm -r ${RPM_BUILD_ROOT}/%{_mandir} +%make_install +rm -r "%{buildroot}/%{_mandir}" %else # Install API documentation -mkdir -p ${RPM_BUILD_ROOT}/%{_mandir} -cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} +mkdir -p "%{buildroot}/%{_mandir}" +cp -a doc/man/* "%{buildroot}/%{_mandir}/" %endif # ! build_man %if ! %{build_man} -%post -n libtalloc2 -p /sbin/ldconfig +%post -n %{libtalloc_name} -p /sbin/ldconfig -%postun -n libtalloc2 -p /sbin/ldconfig +%postun -n %{libtalloc_name} -p /sbin/ldconfig %post -n python-talloc -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 libtalloc2 +%files -n %{libtalloc_name} %defattr(-,root,root) %{_libdir}/libtalloc.so.* @@ -270,6 +245,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 @@ -277,10 +253,8 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} %files %defattr(-,root,root) -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1100 %{_mandir}/man3/libtalloc*.3.* %{_mandir}/man3/talloc*.3.* -%endif %endif # ! build_man diff --git a/talloc.changes b/talloc.changes index 1987301..72eef19 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 2 12:18:30 UTC 2017 - jengelh@inai.de + +- Remove %if guards for blocks that do not affect the build result. + Fix RPM groups and summaries. Drop very old SUSE support. + Replace old RPM macros by new constructs. ------------------------------------------------------------------- Wed Jul 26 08:58:20 UTC 2017 - scabrero@suse.com diff --git a/talloc.spec b/talloc.spec index f30d263..3d12018 100644 --- a/talloc.spec +++ b/talloc.spec @@ -30,34 +30,22 @@ Name: talloc-man BuildRequires: doxygen %else Name: talloc -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 -%define build_make_smp_mflags %{?_smp_mflags} -%else -%define build_make_smp_mflags %{?jobs:-j%jobs} -%endif BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -%if 0%{?suse_version} > 1020 BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif BuildRequires: python-devel %if %{with_python3} BuildRequires: python3-devel %endif -%if 0%{?suse_version} > 1100 #!BuildIgnore: python -%endif %endif # build_man Url: http://talloc.samba.org/ Version: 2.1.10 Release: 0 -PreReq: /sbin/ldconfig Summary: Samba talloc Library License: LGPL-3.0+ -Group: System/Libraries +Group: Development/Libraries/C and C++ 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 @@ -79,7 +67,7 @@ It is the core memory allocator used in Samba. %define libtalloc_name libtalloc %endif %package -n %{libtalloc_name} -Summary: Libraries and Header Files to Develop Programs with talloc2 Support +Summary: Samba talloc library Group: System/Libraries Provides: bundled(libreplace) @@ -100,11 +88,7 @@ Group: Development/Libraries/C and C++ Recommends: %{name}-man %endif Requires: %{libtalloc_name} = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif %description -n libtalloc-devel Talloc is a hierarchical, reference counted memory pool system with @@ -112,30 +96,25 @@ destructors. It is the core memory allocator used in Samba. -Libraries and Header Files to Develop Programs with talloc2 Support +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} -PreReq: /sbin/ldconfig Provides: pytalloc = %{version} Obsoletes: pytalloc < %{version} %description -n python-talloc -This package contains the python bindings for the Talloc library. +This package contains the Python bindings for the Talloc library. %package -n python-talloc-devel Summary: Developer tools for the Talloc library Group: Development/Libraries/Python -Requires: python-talloc = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif +Requires: python-talloc = %{version} Provides: pytalloc-devel = %{version} Obsoletes: pytalloc-devel < %{version} Conflicts: python3-talloc-devel @@ -143,32 +122,23 @@ Conflicts: python3-talloc-devel %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. - +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 +Requires: python3-talloc = %{version} Conflicts: python-talloc-devel %description -n python3-talloc-devel Libraries and Header Files to Develop Programs with python3-talloc Support -%endif %endif # ! build_man @@ -178,13 +148,7 @@ Libraries and Header Files to Develop Programs with python3-talloc Support %build %if ! %{build_man} -%if 0%{?suse_version} && 0%{?suse_version} < 911 - OPTIMIZATION="-O" -%else - # use the default optimization - unset OPTIMIZATION -%endif -export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" +export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -198,7 +162,7 @@ CONFIGURE_OPTIONS="\ %endif " ./configure ${CONFIGURE_OPTIONS} -%{__make} %{build_make_smp_mflags} \ +make %{?_smp_mflags} \ all %else @@ -215,21 +179,21 @@ echo "skipping test on qemu userspace build due to AT_RANDOM not changing" %else # qemu_user_space_build == 1 mkdir lib/talloc ln test_magic_differs* lib/talloc/ -LD_LIBRARY_PATH=bin/shared %{__make} test +LD_LIBRARY_PATH=bin/shared make test %endif # qemu_user_space_build == 1 %endif # suse_version != 1110; fails for i586 and ppc64 %endif # ! build_man %install %if ! %{build_man} -DESTDIR=${RPM_BUILD_ROOT} make install -rm -r ${RPM_BUILD_ROOT}/%{_mandir} +%make_install +rm -r "%{buildroot}/%{_mandir}" %else # Install API documentation -mkdir -p ${RPM_BUILD_ROOT}/%{_mandir} -cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} +mkdir -p "%{buildroot}/%{_mandir}" +cp -a doc/man/* "%{buildroot}/%{_mandir}/" %endif # ! build_man @@ -242,11 +206,9 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} %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) @@ -287,10 +249,8 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} %files %defattr(-,root,root) -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1100 %{_mandir}/man3/libtalloc*.3.* %{_mandir}/man3/talloc*.3.* -%endif %endif # ! build_man From f986d67bde667f5d5e98454aed35972b8af13aff420ab9a037698f175187d1e6 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Mon, 9 Oct 2017 08:50:09 +0000 Subject: [PATCH 4/4] Accepting request 532688 from home:jmcdough:branches:network:samba:STABLE use library name directly instead of variable to pass osc source validation OBS-URL: https://build.opensuse.org/request/show/532688 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=99 --- talloc.changes | 6 ++++++ talloc.spec | 21 ++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/talloc.changes b/talloc.changes index 72eef19..5710c26 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 9 06:55:51 UTC 2017 - jmcdonough@suse.com + +- Reference library name directly instead of using variables to + pass obs source validator. + ------------------------------------------------------------------- Mon Oct 2 12:18:30 UTC 2017 - jengelh@inai.de diff --git a/talloc.spec b/talloc.spec index 3d12018..e97d958 100644 --- a/talloc.spec +++ b/talloc.spec @@ -61,17 +61,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: Samba talloc library Group: System/Libraries Provides: bundled(libreplace) -%description -n %{libtalloc_name} +%description -n libtalloc2 Talloc is a hierarchical, reference counted memory pool system with destructors. @@ -87,7 +82,7 @@ Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1030 Recommends: %{name}-man %endif -Requires: %{libtalloc_name} = %{version} +Requires: libtalloc2 = %{version} Requires: pkg-config %description -n libtalloc-devel @@ -102,7 +97,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} Provides: pytalloc = %{version} Obsoletes: pytalloc < %{version} @@ -125,7 +120,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} %description -n python3-talloc This package contains the Python3 bindings for the Talloc library. @@ -198,9 +193,9 @@ cp -a doc/man/* "%{buildroot}/%{_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 @@ -210,7 +205,7 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %postun -n python3-talloc -p /sbin/ldconfig -%files -n %{libtalloc_name} +%files -n libtalloc2 %defattr(-,root,root) %{_libdir}/libtalloc.so.*