Author: baggins Date: Tue Jan 26 22:31:48 2010 GMT Module: packages Tag: HEAD ---- Log message: - 3.4.5 - merged tdb.spec here - workaround for bug #7030
---- Files affected: packages/samba: samba.spec (1.475 -> 1.476) ---- Diffs: ================================================================ Index: packages/samba/samba.spec diff -u packages/samba/samba.spec:1.475 packages/samba/samba.spec:1.476 --- packages/samba/samba.spec:1.475 Mon Jan 11 17:45:36 2010 +++ packages/samba/samba.spec Tue Jan 26 23:31:42 2010 @@ -2,7 +2,6 @@ # # TODO: # - review python-samba -# - drop tdb.spec and build tdb,tdb-devel,tdb-static package from samba # - look into other distro specs for valid %descriptions for samba 3 # - unpackaged man pages for modules that are not built by default, # maybe we should build them? @@ -12,7 +11,6 @@ # /usr/share/man/man8/vfs_gpfs.8* # /usr/share/man/man8/vfs_notify_fam.8* # /usr/share/man/man8/vfs_prealloc.8* -# - libmsrpc.so is broken (references smbc_attr_server() which is no longer exported from libsmbclient) # - package libs: # libnetapi # libsmbsharemodes @@ -52,13 +50,13 @@ Summary(uk.UTF-8): SMB клієнт та сервер Summary(zh_CN.UTF-8): Samba 客户端和服务器 Name: samba -Version: 3.4.4 +Version: 3.4.5 Release: 0.1 Epoch: 1 License: GPL v3 Group: Networking/Daemons Source0: http://www.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz -# Source0-md5: 491a1bc9c94ad2f1e6d1c29da271b242 +# Source0-md5: 8e8a484782f2b7716b6c6bd9a7d2bf71 Source1: smb.init Source2: %{name}.pamd Source3: swat.inetd @@ -76,6 +74,7 @@ Patch3: %{name}-nscd.patch Patch4: %{name}-lprng-no-dot-printers.patch Patch5: %{name}-python.patch +Patch6: %{name}-disable-unused.patch URL: http://www.samba.org/ BuildRequires: acl-devel BuildRequires: autoconf @@ -84,6 +83,7 @@ %{?with_cups:BuildRequires: cups-devel >= 1:1.2.0} BuildRequires: dmapi-devel BuildRequires: fam-devel +BuildRequires: gdbm-devel BuildRequires: gettext-devel %{?with_kerberos5:BuildRequires: heimdal-devel} BuildRequires: iconv @@ -104,7 +104,6 @@ BuildRequires: readline-devel >= 4.2 BuildRequires: rpmbuild(macros) >= 1.304 BuildRequires: sed >= 4.0 -BuildRequires: tdb-devel BuildRequires: xfsprogs-devel Requires(post,preun): /sbin/chkconfig Requires: %{name}-common = %{epoch}:%{version}-%{release} @@ -379,8 +378,8 @@ Summary(ru.UTF-8): Файлы, используемые как сервером, так и клиентом Samba Summary(uk.UTF-8): Файли, що використовуються як сервером, так і клієнтом Samba Group: Networking/Daemons -Requires: libtalloc >= %{version}-%{release} -Requires: tdb >= 1.1.3 +Requires: libtalloc >= %{epoch}:%{version}-%{release} +Requires: tdb >= %{epoch}:%{version}-%{release} %description common Samba-common provides files necessary for both the server and client @@ -508,6 +507,37 @@ The libtalloc-devel package contains the header files and libraries needed to develop programs that link against the talloc library in the Samba suite. +%package -n tdb +Summary: TDB - Trivial Database +Summary(pl.UTF-8): TDB - prosta baza danych +Group: Libraries +Obsoletes: tdb-extras + +%description -n tdb +TDB is a Trivial Database. In concept, it is very much like GDBM, and +BSD's DB except that it allows multiple simultaneous writers and uses +locking internally to keep writers from trampling on each other. TDB +is also extremely small. + +%description -n tdb -l pl.UTF-8 +TDB to Trivial Database, czyli prosta baza danych. W założeniach jest +bardzo podobna do GDBM lub DB z BSD z wyjątkiem tego, że pozwala na +zapis wielu procesom jednocześnie i używa wewnętrznie blokowania, aby +nie pozwolić piszącym na zadeptanie się nawzajem. TDB jest ponadto +ekstremalnie mała. + +%package -n tdb-devel +Summary: Header files for TDB library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki TDB +Group: Development/Libraries +Requires: tdb = %{epoch}:%{version}-%{release} + +%description -n tdb-devel +Header files for TDB library. + +%description -n tdb-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki TDB. + %package devel Summary: Header files for Samba Summary(pl.UTF-8): Pliki nagłówkowe Samby @@ -981,6 +1011,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html @@ -1106,9 +1137,6 @@ > $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers > $RPM_BUILD_ROOT/etc/security/blacklist.samba -# we have this utility in tdb package -rm -f $RPM_BUILD_ROOT{%{_bindir}/tdb{backup,dump}*,%{_mandir}/man8/tdb{backup,dump}.8*} - # unneeded rm -r $RPM_BUILD_ROOT%{_datadir}/swat/using_samba @@ -1117,11 +1145,6 @@ rm -r $RPM_BUILD_ROOT%{_bindir}/{gentest4,locktest4,masktest4,nsstest4} %endif -mv $RPM_BUILD_ROOT%{_bindir}/tdbtool $RPM_BUILD_ROOT%{_bindir}/tdbtool_samba -%if %{with merged_build} -mv $RPM_BUILD_ROOT%{_bindir}/tdbtool4 $RPM_BUILD_ROOT%{_bindir}/tdbtool4_samba -%endif - %if %{with ldap} install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir} %endif @@ -1214,7 +1237,6 @@ %attr(755,root,root) %{_bindir}/smbstatus %attr(755,root,root) %{_bindir}/smbpasswd %attr(755,root,root) %{_bindir}/smbcontrol -%attr(755,root,root) %{_bindir}/tdbtool_samba %dir %{_libdir}/%{name}/pdb %dir %{_vfsdir} @@ -1372,7 +1394,6 @@ %{_mandir}/man8/idmap_rid.8* %{_mandir}/man8/idmap_tdb.8* %{_mandir}/man8/idmap_tdb2.8* -%{_mandir}/man8/tdbtool.8* %files swat %defattr(644,root,root,755) @@ -1426,6 +1447,26 @@ %attr(755,root,root) %{_libdir}/libtalloc.so %{_includedir}/talloc.h +%files -n tdb +%defattr(644,root,root,755) +%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 +%endif +%attr(755,root,root) %{_libdir}/libtdb.so.* +%{_mandir}/man8/tdbbackup.8* +%{_mandir}/man8/tdbdump.8* +%{_mandir}/man8/tdbtool.8* + +%files -n tdb-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libtdb.so +%{_includedir}/tdb.h + %files devel %defattr(644,root,root,755) %{_includedir}/%{name} @@ -1616,6 +1657,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.476 2010/01/26 22:31:42 baggins +- 3.4.5 +- merged tdb.spec here +- workaround for bug #7030 + Revision 1.475 2010/01/11 16:45:36 baggins - rel 0.1 - doesn't build, source looks badly git-mismerged ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.475&r2=1.476&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
