[packages/samba4] - prepared build and partially install
baggins
baggins at pld-linux.org
Mon Jan 7 16:12:20 CET 2013
commit f66571a4573e7cad9cbb8885589e92f3bd457d11
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Jan 7 16:10:46 2013 +0100
- prepared build and partially install
samba4.spec | 133 +++++++++++++++++++++++++-----------------------------------
1 file changed, 56 insertions(+), 77 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 64f394e..be9ac41 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -5,9 +5,8 @@
%bcond_without kerberos5 # without Kerberos V support
%bcond_without ldap # without LDAP support
%bcond_without avahi
-%bcond_with merged_build # without samba3+samba4 merge
-%bcond_without system_libtalloc
-%bcond_without system_libtdb
+%bcond_with system_libtalloc
+%bcond_with system_libtdb
# http://wiki.samba.org/index.php/Franky
%bcond_with mks # with vfs-mks (mksd dependency not distributale)
@@ -17,13 +16,13 @@
%endif
%if %{with system_libtalloc}
-%define libtalloc_ver 2.0.1
+%define libtalloc_ver 2.0.7
%else
%define libtalloc_ver %{version}-%{release}
%endif
%if %{with system_libtdb}
-%define libtdb_ver 2:1.2.9
+%define libtdb_ver 2:1.2.10
%else
%define libtdb_ver %{version}-%{release}
%endif
@@ -62,6 +61,7 @@ Source7: winbind.init
Source8: winbind.sysconfig
Source10: https://github.com/downloads/fumiyas/samba-virusfilter/samba-virusfilter-%{virusfilter_version}.tar.bz2
# Source10-md5: a3a30d5fbf309d356e8c5833db680c17
+Patch0: system-heimdal.patch
Patch1: samba-c++-nofail.patch
Patch3: samba-nscd.patch
Patch4: samba-lprng-no-dot-printers.patch
@@ -77,9 +77,10 @@ BuildRequires: dmapi-devel
BuildRequires: gamin-devel
BuildRequires: gdbm-devel
BuildRequires: gettext-devel
-%{?with_kerberos5:BuildRequires: heimdal-devel}
+%{?with_kerberos5:BuildRequires: heimdal-devel >= 1.5.3-1}
BuildRequires: iconv
BuildRequires: keyutils-devel
+BuildRequires: libcom_err-devel
BuildRequires: libmagic-devel
BuildRequires: libnscd-devel
BuildRequires: libtool >= 2:1.4d
@@ -99,6 +100,7 @@ BuildRequires: sed >= 4.0
%{?with_system_libtalloc:BuildRequires: talloc-devel >= %{libtalloc_ver}}
%{?with_system_libtdb:BuildRequires: tdb-devel >= %{libtdb_ver}}
BuildRequires: xfsprogs-devel
+BuildConflicts: libbsd-devel
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-common = %{version}-%{release}
Requires: logrotate >= 3.7-4
@@ -321,7 +323,7 @@ Summary(ru.UTF-8): Клиентские программы Samba (SMB)
Summary(uk.UTF-8): Клієнтські програми Samba (SMB)
Group: Applications/Networking
Requires: %{name}-common = %{version}-%{release}
-%{?with_kerberos5:Requires: heimdal-libs}
+%{?with_kerberos5:Requires: heimdal-libs >= 1.5.3-1}
Requires: libsmbclient = %{version}-%{release}
Obsoletes: smbfs
Suggests: cifs-utils
@@ -823,62 +825,65 @@ Samba Module for Python.
%prep
%setup -q -n samba-%{version}
+%patch0 -p1
%patch1 -p1
%patch3 -p1
%patch4 -p1
%build
-# use ld.bfd because gold doesn't understand linker script
-install -d our-ld
-ln -s %{_bindir}/ld.bfd our-ld/ld
-export PATH=$(pwd)/our-ld:$PATH
-
-
-cd source3
-%{__libtoolize}
-%{__autoconf} -Im4 -I../m4 -I../lib/replace -Ilib/replace -I../source4
-%configure \
+LDFLAGS="${LDFLAGS:-%rpmldflags}" \
+CFLAGS="${CFLAGS:-%rpmcflags}" \
+CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" \
+FFLAGS="${FFLAGS:-%rpmcflags}" \
+FCFLAGS="${FCFLAGS:-%rpmcflags}" \
+CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
+%{?__cc:CC="%{__cc}"} \
+%{?__cxx:CXX="%{__cxx}"} \
+./configure \
+ --enable-fhs \
+ --prefix=%{_prefix} \
+ --exec-prefix=%{_exec_prefix} \
+ --bindir=%{_bindir} \
+ --sbindir=%{_sbindir} \
+ --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} \
+ --includedir=%{_includedir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --localstatedir=%{_localstatedir} \
+ --sharedstatedir=%{_sharedstatedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
--with-modulesdir=%{_sambalibdir} \
- --with-rootsbindir=/sbin \
--with-pammodulesdir=/%{_lib}/security \
+ --with-lockdir=/var/lib/samba \
+ --with-privatedir=%{_sysconfdir}/samba \
+ --disable-gnutls \
+ --disable-rpath-install \
+ --builtin-libraries=ccan \
+ --bundled-libraries=NONE,subunit,iniparser,%{!?with_system_libtalloc:talloc},pytalloc,pytalloc-util,%{!?with_system_libtdb:tdb},pytdb,tevent,pytevent,ldb,pyldb,pyldb-util \
+ --private-libraries=smbclient,smbsharemodes,wbclient \
+ --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2,pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4,auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 \
--with-acl-support \
+ --with%{!?with_ads:out}-ads \
--with-aio-support \
--with-automount \
- --with-libsmbclient \
- --with-lockdir=/var/lib/samba \
+ --with-dmapi \
+ --with-dnsupdate \
+ --with-iconv \
+ --with%{!?with_ldap:out}-ldap \
--with-pam \
--with-pam_smbpass \
- --with%{!?with_ads:out}-ads \
- --with-privatedir=%{_sysconfdir}/samba \
--with-quotas \
- --with-readline \
- --with-swatdir=%{_datadir}/swat \
+ --with-sendfile-support \
+ --with-swat \
--with-syslog \
--with-utmp \
- --with-fhs \
-%if %{with system_libtalloc}
- --with-libtalloc=no \
- --enable-external-libtalloc=yes \
-%endif
-%if %{with system_libtdb}
- --with-libtdb=no \
- --enable-external-libtdb=yes \
-%endif
- --without-included-popt \
- --enable-dso \
+ --with-winbind \
--%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
- --disable-dnssd \
- --with%{!?with_ldap:out}-ldap \
- --with%{!?with_kerberos5:out}-krb5
-
-%{__make} -j1 everything pam_smbpass bin/smbget bin/vfstest \
- LD=ld
+ --enable-cups \
+ --enable-iprint
-cd ../examples/VFS
-%{__autoheader}
-%{__autoconf}
-%configure \
- CFLAGS="%{rpmcflags} -fPIC"
%{__make}
%install
@@ -888,7 +893,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig
$RPM_BUILD_ROOT/var/log/samba/cores/{smbd,nmbd} \
$RPM_BUILD_ROOT{/sbin,/%{_lib}/security,%{_libdir},%{_vfsdir},%{_includedir},%{_sambahome},%{schemadir}}
-%{__make} -C source3 install \
+%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba
@@ -903,15 +908,9 @@ cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/winbind
-install -p nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
-ln -s libnss_winbind.so.2 $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
-install -p nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2
-ln -s libnss_wins.so.2 $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so
-install -p source3/bin/wbinfo $RPM_BUILD_ROOT%{_bindir}
-install -p source3/bin/smbget $RPM_BUILD_ROOT%{_bindir}
-install -p source3/bin/vfstest $RPM_BUILD_ROOT%{_bindir}
-
-cp -a source3/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so* $RPM_BUILD_ROOT/%{_lib}
+install -p bin/vfstest $RPM_BUILD_ROOT%{_bindir}
# these are needed to build samba-pdbsql
install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/nsswitch
@@ -934,14 +933,6 @@ ln -s %{_bindir}/smbspool $RPM_BUILD_ROOT%{cups_serverbin}/backend/smb
> $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
> $RPM_BUILD_ROOT/etc/security/blacklist.samba
-# unneeded
-#rm -r $RPM_BUILD_ROOT%{_datadir}/swat/using_samba
-
-# tests
-%if %{with merged_build}
-rm -r $RPM_BUILD_ROOT%{_bindir}/{gentest4,locktest4,masktest4,nsstest4}
-%endif
-
%if %{with ldap}
install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
%endif
@@ -953,8 +944,6 @@ install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
%endif
-%find_lang pam_winbind
-
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
find $RPM_BUILD_ROOT%{py_sitedir} -name "*.py" -o -name "*.a" -o -name "*.la" | xargs rm -f
@@ -1017,13 +1006,11 @@ fi
%attr(755,root,root) %{_sbindir}/nmbd
%attr(755,root,root) %{_sbindir}/smbd
%attr(755,root,root) %{_sbindir}/mksmbpasswd.sh
-%if %{with merged_build}
#%attr(755,root,root) %{_bindir}/ad2oLschema4
%attr(755,root,root) %{_bindir}/oLschema2ldif4
%attr(755,root,root) %{_bindir}/reg*
# "This utility disabled until rewritten"
#%attr(755,root,root) %{_bindir}/setnttoken4
-%endif
%attr(755,root,root) %{_bindir}/smbstatus
%attr(755,root,root) %{_bindir}/smbpasswd
%attr(755,root,root) %{_bindir}/smbta-util
@@ -1093,13 +1080,11 @@ fi
%doc examples/LDAP
%endif
-%files winbind -f pam_winbind.lang
+%files winbind
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/winbindd
%attr(755,root,root) %{_bindir}/wbinfo
-#%if %{with merged_build}
#%attr(755,root,root) %{_bindir}/wbinfo4
-#%endif
%attr(755,root,root) /%{_lib}/security/pam_winbind*
%attr(755,root,root) /%{_lib}/libnss_winbind*
%attr(754,root,root) /etc/rc.d/init.d/winbind
@@ -1115,14 +1100,12 @@ fi
%files client
%defattr(644,root,root,755)
-%if %{with merged_build}
%attr(755,root,root) %{_bindir}/cifsdd4
%attr(755,root,root) %{_bindir}/net4
%attr(755,root,root) %{_bindir}/nmblookup4
%attr(755,root,root) %{_bindir}/smbclient4
%attr(755,root,root) %{_bindir}/setnttoken4
%attr(755,root,root) %{_bindir}/smbtorture4
-%endif
%attr(755,root,root) %{_bindir}/findsmb
%attr(755,root,root) %{_bindir}/net
%attr(755,root,root) %{_bindir}/nmblookup
@@ -1146,12 +1129,10 @@ fi
%files common
%defattr(644,root,root,755)
-%if %{with merged_build}
%attr(755,root,root) %{_bindir}/getntacl4
%attr(755,root,root) %{_bindir}/ndrdump4
%attr(755,root,root) %{_bindir}/ntlm_auth4
%attr(755,root,root) %{_bindir}/testparm4
-%endif
%doc README Manifest WHATSNEW.txt
%doc Roadmap docs/registry/*
%doc docs/{history,THANKS}
@@ -1250,12 +1231,10 @@ fi
%attr(755,root,root) %{_bindir}/tdbbackup
%attr(755,root,root) %{_bindir}/tdbdump
%attr(755,root,root) %{_bindir}/tdbtool
-%if %{with merged_build}
%attr(755,root,root) %{_bindir}/tdbbackup4
%attr(755,root,root) %{_bindir}/tdbdump4
%attr(755,root,root) %{_bindir}/tdbtool4
%attr(755,root,root) %{_bindir}/tdbtorture4
-%endif
%attr(755,root,root) %{_libdir}/libtdb.so.*
%{_mandir}/man8/tdbbackup.8*
%{_mandir}/man8/tdbdump.8*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/samba4.git/commitdiff/f66571a4573e7cad9cbb8885589e92f3bd457d11
More information about the pld-cvs-commit
mailing list