rpm/talloc
SHA256
1
0
Fork 0
forked from pool/talloc
Code Pull Requests Activity

Accepting request 531613 from home:jengelh:branches:network:samba:STABLE

Browse Source 
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
This commit is contained in:
James McDonough 2017-10-06 08:26:58 +00:00 committed by Git OBS Bridge
parent 7380a56fe6
commit 9cca738e8d
4 changed files with 72 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
talloc-man.changes
View File

@ -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 - Update to version 2.1.10
+ build, documentation and python3 improvements + build, documentation and python3 improvements
+ delete sle11-remove-unknown-compiler-options.patch, supported + delete sle11-remove-unknown-compiler-options.patch, supported
options are checked for in upstream code 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 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). - 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 Wed Nov 11 17:49:37 UTC 2015 - lmuelle@suse.com

94
talloc-man.spec
View File

@ -30,36 +30,24 @@ Name: talloc-man
BuildRequires: doxygen BuildRequires: doxygen
%else %else
Name: talloc 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: autoconf
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt BuildRequires: libxslt
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: python-devel BuildRequires: python-devel
%if %{with_python3} %if %{with_python3}
BuildRequires: python3-devel BuildRequires: python3-devel
%endif %endif
%if 0%{?suse_version} > 1100
#!BuildIgnore: python #!BuildIgnore: python
%endif
%endif # build_man %endif # build_man
Url: http://talloc.samba.org/ Url: http://talloc.samba.org/
Version: 2.1.10 Version: 2.1.10
Release: 0 Release: 0
PreReq: /sbin/ldconfig
Summary: Samba talloc Library Summary: Samba talloc Library
License: LGPL-3.0+ License: LGPL-3.0+
Group: System/Libraries Group: Development/Libraries/C and C++
Source: https://download.samba.org/pub/talloc/talloc-%{version}.tar.gz Source: http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz
Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc Source1: http://download.samba.org/pub/talloc/talloc-%{version}.tar.asc
Source4: baselibs.conf Source4: baselibs.conf
Patch0: talloc-python3.5-fix-soabi_name.patch Patch0: talloc-python3.5-fix-soabi_name.patch
Source50: talloc.keyring Source50: talloc.keyring
@ -73,12 +61,17 @@ It is the core memory allocator used in Samba.
%if ! %{build_man} %if ! %{build_man}
%package -n libtalloc2 %if 0%{?suse_version} > 0
Summary: Libraries and Header Files to Develop Programs with talloc2 Support %define libtalloc_name libtalloc2
%else
%define libtalloc_name libtalloc
%endif
%package -n %{libtalloc_name}
Summary: Samba talloc library
Group: System/Libraries Group: System/Libraries
Provides: bundled(libreplace) Provides: bundled(libreplace)
%description -n libtalloc2 %description -n %{libtalloc_name}
Talloc is a hierarchical, reference counted memory pool system with Talloc is a hierarchical, reference counted memory pool system with
destructors. destructors.
@ -94,12 +87,8 @@ Group: Development/Libraries/C and C++
%if 0%{?suse_version} > 1030 %if 0%{?suse_version} > 1030
Recommends: %{name}-man Recommends: %{name}-man
%endif %endif
Requires: libtalloc2 = %{version} Requires: %{libtalloc_name} = %{version}
%if 0%{?suse_version} > 1020
Requires: pkg-config Requires: pkg-config
%else
Requires: pkgconfig
%endif
%description -n libtalloc-devel %description -n libtalloc-devel
Talloc is a hierarchical, reference counted memory pool system with Talloc is a hierarchical, reference counted memory pool system with
@ -107,30 +96,25 @@ destructors.
It is the core memory allocator used in Samba. 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 %package -n python-talloc
Summary: Python bindings for the Talloc library Summary: Python bindings for the Talloc library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: libtalloc2 = %{version} Requires: %{libtalloc_name} = %{version}
PreReq: /sbin/ldconfig
Provides: pytalloc = %{version} Provides: pytalloc = %{version}
Obsoletes: pytalloc < %{version} Obsoletes: pytalloc < %{version}
%description -n python-talloc %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 %package -n python-talloc-devel
Summary: Developer tools for the Talloc library Summary: Developer tools for the Talloc library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: python-talloc = %{version}
%if 0%{?suse_version} > 1020
Requires: pkg-config Requires: pkg-config
%else Requires: python-talloc = %{version}
Requires: pkgconfig
%endif
Provides: pytalloc-devel = %{version} Provides: pytalloc-devel = %{version}
Obsoletes: pytalloc-devel < %{version} Obsoletes: pytalloc-devel < %{version}
Conflicts: python3-talloc-devel Conflicts: python3-talloc-devel
@ -143,22 +127,17 @@ Libraries and Header Files to Develop Programs with python-talloc Support
%package -n python3-talloc %package -n python3-talloc
Summary: Python3 bindings for the Talloc library Summary: Python3 bindings for the Talloc library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: libtalloc2 = %{version} Requires: %{libtalloc_name} = %{version}
PreReq: /sbin/ldconfig
%description -n python3-talloc %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 %package -n python3-talloc-devel
Summary: Developer tools for the Talloc library Summary: Developer tools for the Talloc library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: python3-talloc = %{version}
%if 0%{?suse_version} > 1020
Requires: pkg-config Requires: pkg-config
%else Requires: python3-talloc = %{version}
Requires: pkgconfig
%endif
Conflicts: python-talloc-devel Conflicts: python-talloc-devel
%description -n python3-talloc-devel %description -n python3-talloc-devel
@ -173,13 +152,7 @@ Libraries and Header Files to Develop Programs with python3-talloc Support
%build %build
%if ! %{build_man} %if ! %{build_man}
%if 0%{?suse_version} && 0%{?suse_version} < 911 export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
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"
CONFIGURE_OPTIONS="\ CONFIGURE_OPTIONS="\
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
@ -193,7 +166,7 @@ CONFIGURE_OPTIONS="\
%endif %endif
" "
./configure ${CONFIGURE_OPTIONS} ./configure ${CONFIGURE_OPTIONS}
%{__make} %{build_make_smp_mflags} \ make %{?_smp_mflags} \
all all
%else %else
@ -205,41 +178,43 @@ doxygen doxy.config
%if ! %{build_man} %if ! %{build_man}
%check %check
%if 0%{?suse_version} != 1110 || "%{_build_arch}" == x86_64 %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 mkdir lib/talloc
ln test_magic_differs* 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 # suse_version != 1110; fails for i586 and ppc64
%endif # ! build_man %endif # ! build_man
%install %install
%if ! %{build_man} %if ! %{build_man}
DESTDIR=${RPM_BUILD_ROOT} make install %make_install
rm -r ${RPM_BUILD_ROOT}/%{_mandir} rm -r "%{buildroot}/%{_mandir}"
%else %else
# Install API documentation # Install API documentation
mkdir -p ${RPM_BUILD_ROOT}/%{_mandir} mkdir -p "%{buildroot}/%{_mandir}"
cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} cp -a doc/man/* "%{buildroot}/%{_mandir}/"
%endif # ! build_man %endif # ! build_man
%if ! %{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 %post -n python-talloc -p /sbin/ldconfig
%postun -n python-talloc -p /sbin/ldconfig %postun -n python-talloc -p /sbin/ldconfig
%if %{with_python3}
%post -n python3-talloc -p /sbin/ldconfig %post -n python3-talloc -p /sbin/ldconfig
%postun -n python3-talloc -p /sbin/ldconfig %postun -n python3-talloc -p /sbin/ldconfig
%endif
%files -n libtalloc2 %files -n %{libtalloc_name}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libtalloc.so.* %{_libdir}/libtalloc.so.*
@ -270,6 +245,7 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir}
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/pytalloc.h %{_includedir}/pytalloc.h
%{_libdir}/pkgconfig/pytalloc-util.pc %{_libdir}/pkgconfig/pytalloc-util.pc
%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc
%{_libdir}/libpytalloc-util.%{py3_soflags}.so %{_libdir}/libpytalloc-util.%{py3_soflags}.so
%endif %endif
@ -277,10 +253,8 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1100
%{_mandir}/man3/libtalloc*.3.* %{_mandir}/man3/libtalloc*.3.*
%{_mandir}/man3/talloc*.3.* %{_mandir}/man3/talloc*.3.*
%endif
%endif # ! build_man %endif # ! build_man

6
talloc.changes
View File

@ -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 Wed Jul 26 08:58:20 UTC 2017 - scabrero@suse.com

68
talloc.spec
View File

@ -30,34 +30,22 @@ Name: talloc-man
BuildRequires: doxygen BuildRequires: doxygen
%else %else
Name: talloc 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: autoconf
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt BuildRequires: libxslt
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: python-devel BuildRequires: python-devel
%if %{with_python3} %if %{with_python3}
BuildRequires: python3-devel BuildRequires: python3-devel
%endif %endif
%if 0%{?suse_version} > 1100
#!BuildIgnore: python #!BuildIgnore: python
%endif
%endif # build_man %endif # build_man
Url: http://talloc.samba.org/ Url: http://talloc.samba.org/
Version: 2.1.10 Version: 2.1.10
Release: 0 Release: 0
PreReq: /sbin/ldconfig
Summary: Samba talloc Library Summary: Samba talloc Library
License: LGPL-3.0+ License: LGPL-3.0+
Group: System/Libraries Group: Development/Libraries/C and C++
Source: http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz Source: http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz
Source1: http://download.samba.org/pub/talloc/talloc-%{version}.tar.asc Source1: http://download.samba.org/pub/talloc/talloc-%{version}.tar.asc
Source4: baselibs.conf Source4: baselibs.conf
@ -79,7 +67,7 @@ It is the core memory allocator used in Samba.
%define libtalloc_name libtalloc %define libtalloc_name libtalloc
%endif %endif
%package -n %{libtalloc_name} %package -n %{libtalloc_name}
Summary: Libraries and Header Files to Develop Programs with talloc2 Support Summary: Samba talloc library
Group: System/Libraries Group: System/Libraries
Provides: bundled(libreplace) Provides: bundled(libreplace)
@ -100,11 +88,7 @@ Group: Development/Libraries/C and C++
Recommends: %{name}-man Recommends: %{name}-man
%endif %endif
Requires: %{libtalloc_name} = %{version} Requires: %{libtalloc_name} = %{version}
%if 0%{?suse_version} > 1020
Requires: pkg-config Requires: pkg-config
%else
Requires: pkgconfig
%endif
%description -n libtalloc-devel %description -n libtalloc-devel
Talloc is a hierarchical, reference counted memory pool system with Talloc is a hierarchical, reference counted memory pool system with
@ -112,30 +96,25 @@ destructors.
It is the core memory allocator used in Samba. 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 %package -n python-talloc
Summary: Python bindings for the Talloc library Summary: Python bindings for the Talloc library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %{libtalloc_name} = %{version} Requires: %{libtalloc_name} = %{version}
PreReq: /sbin/ldconfig
Provides: pytalloc = %{version} Provides: pytalloc = %{version}
Obsoletes: pytalloc < %{version} Obsoletes: pytalloc < %{version}
%description -n python-talloc %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 %package -n python-talloc-devel
Summary: Developer tools for the Talloc library Summary: Developer tools for the Talloc library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: python-talloc = %{version}
%if 0%{?suse_version} > 1020
Requires: pkg-config Requires: pkg-config
%else Requires: python-talloc = %{version}
Requires: pkgconfig
%endif
Provides: pytalloc-devel = %{version} Provides: pytalloc-devel = %{version}
Obsoletes: pytalloc-devel < %{version} Obsoletes: pytalloc-devel < %{version}
Conflicts: python3-talloc-devel Conflicts: python3-talloc-devel
@ -143,32 +122,23 @@ Conflicts: python3-talloc-devel
%description -n python-talloc-devel %description -n python-talloc-devel
Libraries and Header Files to Develop Programs with python-talloc Support Libraries and Header Files to Develop Programs with python-talloc Support
%if %{with_python3}
%package -n python3-talloc %package -n python3-talloc
Summary: Python3 bindings for the Talloc library Summary: Python3 bindings for the Talloc library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %{libtalloc_name} = %{version} Requires: %{libtalloc_name} = %{version}
PreReq: /sbin/ldconfig
%description -n python3-talloc %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 %package -n python3-talloc-devel
Summary: Developer tools for the Talloc library Summary: Developer tools for the Talloc library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: python3-talloc = %{version}
%if 0%{?suse_version} > 1020
Requires: pkg-config Requires: pkg-config
%else Requires: python3-talloc = %{version}
Requires: pkgconfig
%endif
Conflicts: python-talloc-devel Conflicts: python-talloc-devel
%description -n python3-talloc-devel %description -n python3-talloc-devel
Libraries and Header Files to Develop Programs with python3-talloc Support Libraries and Header Files to Develop Programs with python3-talloc Support
%endif
%endif # ! build_man %endif # ! build_man
@ -178,13 +148,7 @@ Libraries and Header Files to Develop Programs with python3-talloc Support
%build %build
%if ! %{build_man} %if ! %{build_man}
%if 0%{?suse_version} && 0%{?suse_version} < 911 export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
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"
CONFIGURE_OPTIONS="\ CONFIGURE_OPTIONS="\
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
@ -198,7 +162,7 @@ CONFIGURE_OPTIONS="\
%endif %endif
" "
./configure ${CONFIGURE_OPTIONS} ./configure ${CONFIGURE_OPTIONS}
%{__make} %{build_make_smp_mflags} \ make %{?_smp_mflags} \
all all
%else %else
@ -215,21 +179,21 @@ echo "skipping test on qemu userspace build due to AT_RANDOM not changing"
%else # qemu_user_space_build == 1 %else # qemu_user_space_build == 1
mkdir lib/talloc mkdir lib/talloc
ln test_magic_differs* 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 # qemu_user_space_build == 1
%endif # suse_version != 1110; fails for i586 and ppc64 %endif # suse_version != 1110; fails for i586 and ppc64
%endif # ! build_man %endif # ! build_man
%install %install
%if ! %{build_man} %if ! %{build_man}
DESTDIR=${RPM_BUILD_ROOT} make install %make_install
rm -r ${RPM_BUILD_ROOT}/%{_mandir} rm -r "%{buildroot}/%{_mandir}"
%else %else
# Install API documentation # Install API documentation
mkdir -p ${RPM_BUILD_ROOT}/%{_mandir} mkdir -p "%{buildroot}/%{_mandir}"
cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} cp -a doc/man/* "%{buildroot}/%{_mandir}/"
%endif # ! build_man %endif # ! build_man
@ -242,11 +206,9 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir}
%postun -n python-talloc -p /sbin/ldconfig %postun -n python-talloc -p /sbin/ldconfig
%if %{with_python3}
%post -n python3-talloc -p /sbin/ldconfig %post -n python3-talloc -p /sbin/ldconfig
%postun -n python3-talloc -p /sbin/ldconfig %postun -n python3-talloc -p /sbin/ldconfig
%endif
%files -n %{libtalloc_name} %files -n %{libtalloc_name}
%defattr(-,root,root) %defattr(-,root,root)
@ -287,10 +249,8 @@ cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1100
%{_mandir}/man3/libtalloc*.3.* %{_mandir}/man3/libtalloc*.3.*
%{_mandir}/man3/talloc*.3.* %{_mandir}/man3/talloc*.3.*
%endif
%endif # ! build_man %endif # ! build_man