forked from pool/talloc
Accepting request 591706 from home:dimstar:Factory
- Eliminate usage of %__cp and %__mkdir_p. ran pre_checkin.sh, to sync up things again, which is why talloc-man has sssuch a big diff. OBS-URL: https://build.opensuse.org/request/show/591706 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=103
This commit is contained in:
Aurelien Aptel
Git OBS Bridge
parent
e882c424e3
commit
138b92c0d0
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 27 16:24:11 UTC 2018 - dimstar@opensuse.org
|
||||
|
||||
- Eliminate usage of %__cp and %__mkdir_p.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 16 17:49:24 UTC 2018 - jmcdonough@suse.com
|
||||
|
||||
|
||||
@ -18,6 +18,8 @@
|
||||
|
||||
%{!?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}
|
||||
%{!?py3_soflags_dash: %global py3_soflags_dash %(echo %{py3_soflags} | sed "s/_/-/g")}
|
||||
%{!?py3_incdir: %global py3_incdir %(%{__python3} -c "import sysconfig as s; print(s.get_path('include'))")}
|
||||
%if 0%{?suse_version} > 1310 || 0%{?fedora_version} > 20
|
||||
%define with_python3 1
|
||||
%else
|
||||
@ -36,6 +38,7 @@ BuildRequires: libxslt
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: python-devel
|
||||
%if %{with_python3}
|
||||
BuildRequires: python3-base
|
||||
BuildRequires: python3-devel
|
||||
%endif
|
||||
#!BuildIgnore: python
|
||||
@ -61,17 +64,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 +85,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 +100,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}
|
||||
|
||||
@ -117,32 +115,26 @@ Requires: pkg-config
|
||||
Requires: python-talloc = %{version}
|
||||
Provides: pytalloc-devel = %{version}
|
||||
Obsoletes: pytalloc-devel < %{version}
|
||||
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}
|
||||
Requires: libtalloc2 = %{version}
|
||||
|
||||
%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: pkg-config
|
||||
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
|
||||
|
||||
@ -192,7 +184,12 @@ LD_LIBRARY_PATH=bin/shared make test
|
||||
%if ! %{build_man}
|
||||
%make_install
|
||||
rm -r "%{buildroot}/%{_mandir}"
|
||||
|
||||
%if %{with_python3}
|
||||
mkdir -p %{buildroot}/%{py3_incdir}
|
||||
cp %{buildroot}/%{_includedir}/pytalloc.h %{buildroot}/%{py3_incdir}/pytalloc.h
|
||||
sed -i 's;${prefix}/include;%{py3_incdir};g' %{buildroot}/%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc
|
||||
sed -i 's;-lpytalloc-util.%{py3_soflags_dash};-lpytalloc-util.%{py3_soflags};g' %{buildroot}/%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc
|
||||
%endif
|
||||
%else
|
||||
|
||||
# Install API documentation
|
||||
@ -202,9 +199,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
|
||||
|
||||
@ -214,7 +211,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.*
|
||||
|
||||
@ -243,8 +240,7 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/"
|
||||
|
||||
%files -n python3-talloc-devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/pytalloc.h
|
||||
%{_libdir}/pkgconfig/pytalloc-util.pc
|
||||
%{py3_incdir}/pytalloc.h
|
||||
%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc
|
||||
%{_libdir}/libpytalloc-util.%{py3_soflags}.so
|
||||
%endif
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 27 16:24:11 UTC 2018 - dimstar@opensuse.org
|
||||
|
||||
- Eliminate usage of %__cp and %__mkdir_p.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 16 17:49:24 UTC 2018 - jmcdonough@suse.com
|
||||
|
||||
|
||||
@ -185,8 +185,8 @@ LD_LIBRARY_PATH=bin/shared make test
|
||||
%make_install
|
||||
rm -r "%{buildroot}/%{_mandir}"
|
||||
%if %{with_python3}
|
||||
%{__mkdir_p} %{buildroot}/%{py3_incdir}
|
||||
%{__cp} %{buildroot}/%{_includedir}/pytalloc.h %{buildroot}/%{py3_incdir}/pytalloc.h
|
||||
mkdir -p %{buildroot}/%{py3_incdir}
|
||||
cp %{buildroot}/%{_includedir}/pytalloc.h %{buildroot}/%{py3_incdir}/pytalloc.h
|
||||
sed -i 's;${prefix}/include;%{py3_incdir};g' %{buildroot}/%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc
|
||||
sed -i 's;-lpytalloc-util.%{py3_soflags_dash};-lpytalloc-util.%{py3_soflags};g' %{buildroot}/%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc
|
||||
%endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user