Author: glen Date: Sat Oct 1 22:11:49 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- add system libtdb bcond, enable it; preserve timestamps while installing
---- Files affected:
packages/samba:
samba.spec (1.508 -> 1.509)
---- Diffs:
================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.508 packages/samba/samba.spec:1.509
--- packages/samba/samba.spec:1.508 Tue Sep 6 17:22:09 2011
+++ packages/samba/samba.spec Sun Oct 2 00:11:44 2011
@@ -26,6 +26,7 @@
%bcond_without avahi
%bcond_with merged_build # without samba3+samba4 merge
%bcond_without system_libtalloc
+%bcond_without system_libtdb
#
http://wiki.samba.org/index.php/Franky
%bcond_with mks # with vfs-mks (mksd dependency not
distributale)
@@ -34,7 +35,17 @@
%undefine with_ads
%endif
-%define libtalloc_ver 2:2.0.1
+%if %{with system_libtalloc}
+%define libtalloc_ver 2:2.0.1
+%else
+%define libtalloc_ver %{epoch}:%{version}-%{release}
+%endif
+
+%if %{with system_libtdb}
+%define libtdb_ver 1.2.9
+%else
+%define libtdb_ver %{epoch}:%{version}-%{release}
+%endif
%define vscan_version 0.3.6c-beta5
Summary: SMB server
@@ -55,7 +66,7 @@
Summary(zh_CN.UTF-8): Samba 客户端和服务器
Name: samba
Version: 3.5.11
-Release: 1
+Release: 2
Epoch: 1
License: GPL v3
Group: Networking/Daemons
@@ -107,6 +118,7 @@
BuildRequires: readline-devel >= 4.2
BuildRequires: rpmbuild(macros) >= 1.304
BuildRequires: sed >= 4.0
+%{?with_system_libtdb:BuildRequires: tdb-devel >= %{libtdb_ver}}
BuildRequires: xfsprogs-devel
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -376,12 +388,8 @@
Summary(ru.UTF-8): Файлы, используемые как сервером, так и клиентом Samba
Summary(uk.UTF-8): Файли, що використовуються як сервером, так і клієнтом
Samba
Group: Networking/Daemons
-%if %{without system_libtalloc}
-Requires: libtalloc >= %{epoch}:%{version}-%{release}
-%else
Requires: libtalloc >= %{libtalloc_ver}
-%endif
-Requires: tdb >= %{epoch}:%{version}-%{release}
+Requires: tdb >= %{libtdb_ver}
%description common
Samba-common provides files necessary for both the server and client
@@ -883,6 +891,10 @@
--with-libtalloc=no \
--enable-external-libtalloc=yes \
%endif
+%if %{with system_libtdb}
+ --with-libtdb=no \
+ --enable-external-libtdb=yes \
+%endif
--without-included-popt \
--%{?with_merged_build:en}%{!?with_merged_build:dis}able-merged-build \
--enable-automatic-dependencies \
@@ -918,37 +930,40 @@
DESTDIR=$RPM_BUILD_ROOT \
CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba
-install source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_sbindir}
+install -p source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_sbindir}
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/samba
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/swat
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/samba
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/samba
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/winbind
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/samba
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/swat
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/samba
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/samba
+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 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
+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 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2
+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 source3/bin/wbinfo $RPM_BUILD_ROOT%{_bindir}
-install source3/bin/smbget $RPM_BUILD_ROOT%{_bindir}
-install source3/bin/vfstest $RPM_BUILD_ROOT%{_bindir}
+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}
-install source3/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
+cp -a source3/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
# smbwrapper
-install examples/libsmbclient/smbwrapper/smbwrapper.so
$RPM_BUILD_ROOT%{_libdir}/smbwrapper.so
-install examples/libsmbclient/smbwrapper/smbsh $RPM_BUILD_ROOT%{_bindir}
-install examples/libsmbclient/smbwrapper/smbsh.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -p examples/libsmbclient/smbwrapper/smbwrapper.so
$RPM_BUILD_ROOT%{_libdir}/smbwrapper.so
+install -p examples/libsmbclient/smbwrapper/smbsh $RPM_BUILD_ROOT%{_bindir}
+cp -p examples/libsmbclient/smbwrapper/smbsh.1 $RPM_BUILD_ROOT%{_mandir}/man1
# these are needed to build samba-pdbsql
-install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/{tdb,nsswitch}
+install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/nsswitch
cp -a source3/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
-cp -a lib/tdb/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/tdb
cp -a nsswitch/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/nsswitch
+%if %{without system_libtdb}
+install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/tdb
+cp -a lib/tdb/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/tdb
+%endif
touch $RPM_BUILD_ROOT/var/lib/samba/{wins.dat,browse.dat}
@@ -974,6 +989,13 @@
install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
%endif
+%if %{with system_libtdb}
+# remove manuals of tdb if system lib used
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
+%endif
+
%find_lang pam_winbind
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
@@ -1281,6 +1303,7 @@
%{_includedir}/talloc.h
%endif
+%if %{without system_libtdb}
%files -n tdb
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/tdbbackup
@@ -1301,6 +1324,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libtdb.so
%{_includedir}/tdb.h
+%endif
%files devel
%defattr(644,root,root,755)
@@ -1430,6 +1454,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.509 2011/10/01 22:11:44 glen
+- add system libtdb bcond, enable it; preserve timestamps while installing
+
Revision 1.508 2011/09/06 15:22:09 arekm
- up to 3.5.11
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.508&r2=1.509&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
