Attachment 945127 Details for Bug 834603 – Corrected version of previous patch

[patch] Corrected version of previous patch

file_834603.txt (text/plain), 5.83 KB, created by Christian Tosta on 2014-10-08 18:02:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Tosta

Created: 2014-10-08 18:02:37 UTC

Size: 5.83 KB

patch

obsolete

>--- samba.spec  2014-10-07 11:22:52.000000000 -0300
>+++ samba.spec  2014-10-08 14:58:13.353472622 -0300
>@@ -5,15 +5,18 @@
> %bcond_with testsuite
> # ctdb is enabled by default, you can disable it with: --without clustering
> %bcond_without clustering
>+# build against internal heimdal is disabled by default, yu can enable
>+# it with: --with heimdal to build Samba with full AD DC functionality.
>+%bcond_with heimdal
>
>-%define main_release 5
>+%define main_release 5.1
>
> %define samba_version 4.1.12
>-%define talloc_version 2.0.8
>+%define talloc_version 2.1.0
> %define ntdb_version 0.9
>-%define tdb_version 1.2.12
>-%define tevent_version 0.9.18
>-%define ldb_version 1.1.16
>+%define tdb_version 1.2.13
>+%define tevent_version 0.9.21
>+%define ldb_version 1.1.17
> # This should be rc1 or nil
> %define pre_release %nil
>
>@@ -46,6 +49,13 @@
> %global with_mitkrb5 1
> %global with_dc 0
>
>+%if %{with heimdal}
>+%define pkg_name_suffix 4
>+%global _with_testsuite 1
>+%global with_mitkrb5 0
>+%global with_dc 1
>+%endif
>+
> %if %{with testsuite}
> # The testsuite only works with a full build right now.
> %global with_mitkrb5 0
>@@ -61,7 +71,7 @@
> %{!?python_libdir: %define python_libdir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,1)")}
> %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
>
>-Name:           samba
>+Name:           samba%{?pkg_name_suffix}
> Version:        %{samba_version}
> Release:        %{samba_release}
>
>@@ -103,10 +113,10 @@
> Requires(preun): systemd
> Requires(postun): systemd
>
>-Requires(pre): %{name}-common = %{samba_depver}
>-Requires: %{name}-libs = %{samba_depver}
>+Requires(pre): %{name}%{?pkg_name_suffix}-common = %{samba_depver}
>+Requires: %{name}%{?pkg_name_suffix}-libs = %{samba_depver}
> %if %with_libwbclient
>-Requires: libwbclient = %{samba_depver}
>+Requires: libwbclient%{?pkg_name_suffix} = %{samba_depver}
> %endif
>
> Provides: samba4 = %{samba_depver}
>@@ -316,43 +326,43 @@
>
> ### LIBSMBCLIENT
> %if %with_libsmbclient
>-%package -n libsmbclient
>+%package -n libsmbclient%{?pkg_name_suffix}
> Summary: The SMB client library
> Group: Applications/System
> Requires: %{name}-common = %{samba_depver}
> Requires: %{name}-libs = %{samba_depver}
>
>-%description -n libsmbclient
>+%description -n libsmbclient%{?pkg_name_suffix}
> The libsmbclient contains the SMB client library from the Samba suite.
>
>-%package -n libsmbclient-devel
>+%package -n libsmbclient%{?pkg_name_suffix}-devel
> Summary: Developer tools for the SMB client library
> Group: Development/Libraries
>-Requires: libsmbclient = %{samba_depver}
>+Requires: libsmbclient%{?pkg_name_suffix} = %{samba_depver}
>
>-%description -n libsmbclient-devel
>+%description -n libsmbclient%{?pkg_name_suffix}-devel
> The libsmbclient-devel package contains the header files and libraries needed to
> develop programs that link against the SMB client library in the Samba suite.
> %endif # with_libsmbclient
>
> ### LIBWBCLIENT
> %if %with_libwbclient
>-%package -n libwbclient
>+%package -n libwbclient%{?pkg_name_suffix}
> Summary: The winbind client library
> Group: Applications/System
> Requires: %{name}-libs = %{samba_depver}
>
>-%description -n libwbclient
>+%description -n libwbclient%{?pkg_name_suffix}
> The libwbclient package contains the winbind client library from the Samba suite.
>
>-%package -n libwbclient-devel
>+%package -n libwbclient%{?pkg_name_suffix}-devel
> Summary: Developer tools for the winbind library
> Group: Development/Libraries
>-Requires: libwbclient = %{samba_depver}
>+Requires: libwbclient%{?pkg_name_suffix} = %{samba_depver}
> Obsoletes: samba-winbind-devel
> Provides: samba-winbind-devel
>
>-%description -n libwbclient-devel
>+%description -n libwbclient%{?pkg_name_suffix}-devel
> The libwbclient-devel package provides developer tools for the wbclient library.
> %endif # with_libwbclient
>
>@@ -714,15 +724,15 @@
> %postun libs -p /sbin/ldconfig
>
> %if %with_libsmbclient
>-%post -n libsmbclient -p /sbin/ldconfig
>+%post -n libsmbclient%{?pkg_name_suffix} -p /sbin/ldconfig
>
>-%postun -n libsmbclient -p /sbin/ldconfig
>+%postun -n libsmbclient%{?pkg_name_suffix} -p /sbin/ldconfig
> %endif # with_libsmbclient
>
> %if %with_libwbclient
>-%post -n libwbclient -p /sbin/ldconfig
>+%post -n libwbclient%{?pkg_name_suffix} -p /sbin/ldconfig
>
>-%postun -n libwbclient -p /sbin/ldconfig
>+%postun -n libwbclient%{?pkg_name_suffix} -p /sbin/ldconfig
> %endif # with_libwbclient
>
> %post test -p /sbin/ldconfig
>@@ -1430,13 +1440,13 @@
>
> ### LIBSMBCLIENT
> %if %with_libsmbclient
>-%files -n libsmbclient
>+%files -n libsmbclient%{?pkg_name_suffix}
> %defattr(-,root,root)
> %{_libdir}/libsmbclient.so.*
> %{_libdir}/libsmbsharemodes.so.*
>
> ### LIBSMBCLIENT-DEVEL
>-%files -n libsmbclient-devel
>+%files -n libsmbclient%{?pkg_name_suffix}-devel
> %defattr(-,root,root)
> %{_includedir}/samba-4.0/libsmbclient.h
> %{_includedir}/samba-4.0/smb_share_modes.h
>@@ -1449,13 +1459,13 @@
>
> ### LIBWBCLIENT
> %if %with_libwbclient
>-%files -n libwbclient
>+%files -n libwbclient%{?pkg_name_suffix}
> %defattr(-,root,root)
> %{_libdir}/libwbclient.so.*
> %{_libdir}/samba/libwinbind-client.so
>
> ### LIBWBCLIENT-DEVEL
>-%files -n libwbclient-devel
>+%files -n libwbclient%{?pkg_name_suffix}-devel
> %defattr(-,root,root)
> %{_includedir}/samba-4.0/wbclient.h
> %{_libdir}/libwbclient.so
>@@ -1587,6 +1597,14 @@
> %{_mandir}/man8/pam_winbind.8*
>
> %changelog
>+* Wed Oct 08 2014 - Christian Tosta <tosta@ekaaty.org> - 4.1.12-5.1
>+- Added a package variant for build with internal heimdal
>+- Samba 4.1.12 needs:
>+  + libldb at least 1.1.17
>+  + libtdb at least 1.2.13
>+  + libtevent at least 0.9.21
>+  + libtalloc at least 2.1.0
>+
> * Tue Oct 07 2014 - Andreas Schneider <asn@redhat.com> - 4.1.12-5
> - resolves: #1033595 - Fix segfault in winbind.
>

Actions: View | Diff

Attachments on bug 834603: 593770 | 593771 | 594194 | 595555 | 602237 | 602245 | 609612 | 609614 | 611674 | 613981 | 616403 | 620199 | 622289 | 945120 | 945127