rpms/samba
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.4.0pre2.

Browse Source 
Guenther
This commit is contained in:
Guenther Deschner 2009-06-08 18:12:51 +00:00
parent 76906e5382
commit 79b7edaea3
4 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
samba-3.4.0pre1.tar.gz samba-3.4.0pre2.tar.gz

28
samba-3.4.0pre1-nss_wins.patch
View File

@ -1,28 +0,0 @@
commit eee446a94841a5df97b3a47c7076ef52fb5ccdcf
Author: Günther Deschner <gd@samba.org>
AuthorDate: Thu Apr 30 14:16:01 2009 +0200
Commit: Günther Deschner <gd@samba.org>
CommitDate: Thu Apr 30 14:18:09 2009 +0200
s3-nss_wins: Fix unresolved ldb symbols in libnss_wins.so.
The objects for this module should probably be cleaned up once.
Guenther
---
source3/Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f765818..8bf29dd 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1063,7 +1063,7 @@ SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) \
WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \
$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBNDR_GEN_OBJ0)
+ $(LIBNDR_GEN_OBJ0) $(LDB_OBJ)
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
pam_smbpass/pam_smb_acct.o pam_smbpass/support.o

17
samba.spec
View File

@ -1,9 +1,9 @@
%define main_release 37 %define main_release 37
%define samba_version 3.4.0 %define samba_version 3.4.0
%define tdb_version 1.1.2 %define tdb_version 1.1.3
%define talloc_version 1.2.0 %define talloc_version 1.2.0
#%define pre_release %nil #%define pre_release %nil
%define pre_release pre1 %define pre_release pre2
%define samba_release 0%{pre_release}.%{main_release}%{?dist} %define samba_release 0%{pre_release}.%{main_release}%{?dist}
@ -48,7 +48,6 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
# The passwd part has been applied, but not the group part # The passwd part has been applied, but not the group part
Patch107: samba-3.2.0pre1-grouppwd.patch Patch107: samba-3.2.0pre1-grouppwd.patch
Patch200: samba-3.2.5-inotify.patch Patch200: samba-3.2.5-inotify.patch
Patch201: samba-3.4.0pre1-nss_wins.patch
Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release} Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
Requires: pam >= 0:0.64 Requires: pam >= 0:0.64
@ -58,6 +57,12 @@ Requires(post): /sbin/chkconfig, /sbin/service
Requires(preun): /sbin/chkconfig, /sbin/service Requires(preun): /sbin/chkconfig, /sbin/service
BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel, ctdb-devel BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel, ctdb-devel
BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel
%if ! %enable_talloc
BuildRequires: libtalloc-devel
%endif
%if ! %enable_tdb
BuildRequires: libtdb-devel
%endif
# Working around perl dependency problem from docs # Working around perl dependency problem from docs
%define __perl_requires %{SOURCE999} %define __perl_requires %{SOURCE999}
@ -253,7 +258,6 @@ cp %{SOURCE11} packaging/Fedora/
#%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
%patch107 -p1 -b .grouppwd %patch107 -p1 -b .grouppwd
%patch200 -p0 -b .inotify %patch200 -p0 -b .inotify
%patch201 -p1 -b .nss_wins
mv %samba_source/VERSION %samba_source/VERSION.orig mv %samba_source/VERSION %samba_source/VERSION.orig
sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@ -391,6 +395,7 @@ ln -sf /%{_lib}/libnss_wins.so.2 $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so
# libraries { # libraries {
mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir} mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
build_libdir="$RPM_BUILD_ROOT%{_libdir}"
%if %enable_talloc %if %enable_talloc
# talloc # talloc
@ -414,7 +419,6 @@ install -m 644 lib/tdb/tdb.pc $build_libdir/pkgconfig/
# (but at least gets the versioning right now) # (but at least gets the versioning right now)
list="smbclient smbsharemodes netapi talloc tdb wbclient" list="smbclient smbsharemodes netapi talloc tdb wbclient"
build_libdir="$RPM_BUILD_ROOT%{_libdir}"
for i in $list; do for i in $list; do
install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
done done
@ -881,6 +885,9 @@ exit 0
%{_datadir}/pixmaps/samba/logo-small.png %{_datadir}/pixmaps/samba/logo-small.png
%changelog %changelog
* Mon Jun 08 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.0pre2-0.38
- Update to 3.4.0pre2
* Thu Apr 30 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.0pre1-0.37 * Thu Apr 30 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.0pre1-0.37
- Update to 3.4.0pre1 - Update to 3.4.0pre1

2
sources
View File

@ -1 +1 @@
144f28202edef96b87f31db9cdd0cf5b samba-3.4.0pre1.tar.gz d13646fdd52547fb2fe5ea020ba1b24e samba-3.4.0pre2.tar.gz