[SCM] Samba Shared Repository - branch v3-5-test updated
Michael Adam
obnox at samba.org
Fri Nov 13 09:32:13 MST 2009
The branch, v3-5-test has been updated
via d0ac2c8... add e2fsprogs-devel as build dependency this is needed for AD because it contains libcom/libcom_err files and headers
via cfe3274... packaging(RHEL-CTDB): add the current githash to the rpm release number by default
via 3e775a2... packaging(RHEL-CTDB): enable parallel build
via 7a91ead... packaging(RHEL-CTDB): fix packaging of pam_winbind.mo file
via 2d4f971... packaging(RHEL-CTDB): move the idmap and nss_info modules to the common package
via a0c65f9... packaging(RHEL-CTDB): package the winbind_krb5_locator.so plugin
via e97d6bd... packaging(RHEL-CTDB): package the manpage of the winbind_krb5_locator plugin
via 2fa621d... packaging(RHEL-CTDB): package the manpage of "ldbrename"
via 331b816... packaging(RHEL-CTDB): package the manpage of "sharesec"
via d70f61a... packaging(RHEL-CTDB): pam_winbindd man page has moved from section 7 to 8
via 94bcef7... packaging(RHEL-CTDB): disable the merged build.
via 34be433... packaging(RHEL-CTDB): also pack libwbcient in winbind-32bit package
via 0c4c24a... packaging(RHEL-CTDB): add new pam_winbind.mo to the common package
via f8772b9... packaging(RHEL-CTDB): add new binary sharesec to the client package.
via e364d9c... packaging(RHEL-CTDB): add new binary ldbrename to the common rpm
via 5bfcde9... packaging(RHEL-CTDB): fix location of nsswitch/ directory for install
via 58c72fa... packaging(RHEL-CTDB): don't pass CFLAGS to make.
via c4d02ed... packaging(RHEL-CTDB): don't "make proto" any more.
via c4af2b6... packaging(RHEL-CTDB):makerpms.sh: replace source/ by source3/
via 1421aad... packaging(RHEL-CTDB):makespec.sh: fix detection of version
via 3a56367... packaging(RHEL-CTDB): makeversion.sh: v3-4-test uses source3 instead of source
via 63d465c... packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build
via 0fa142f... packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build
via fe585b5... packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from version.h
via d39a1b4... packaging(RHEL-CTDB): The former release number has basically moved into VERSION
from ee2565b... s3:smbd: also fill the memcache with sid<->id mappings in ldapsam_sid_to_id()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit d0ac2c8a0ad59a118194102b2f6882e474f750a2
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date: Mon Jul 6 14:08:57 2009 +0200
add e2fsprogs-devel as build dependency this is needed for AD because it contains libcom/libcom_err files and headers
Signed-off-by: Christian Ambach <christian.ambach at de.ibm.com>
Signed-off-by: Michael Adam <obnox at samba.org>
commit cfe3274345a2e29dea0d3055ed831fe4d52179e8
Author: Michael Adam <obnox at samba.org>
Date: Wed Nov 4 12:26:46 2009 +0100
packaging(RHEL-CTDB): add the current githash to the rpm release number by default
Disable this (to build a release-rpm) by calling
USE_GITHASH=no makerpms.sh
Michael
commit 3e775a2210bba4af07965c090d565e9185984d76
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 20 13:37:11 2009 +0200
packaging(RHEL-CTDB): enable parallel build
Michael
commit 7a91ead09f002926230f6e3c248b6ef586509630
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 20 13:33:42 2009 +0200
packaging(RHEL-CTDB): fix packaging of pam_winbind.mo file
Michael
commit 2d4f971ff5b0f1b582370cb45aa70a53c94ab5da
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 3 15:30:42 2009 +0200
packaging(RHEL-CTDB): move the idmap and nss_info modules to the common package
In this layout, this is the package that contains winbindd related stuff.
Michael
commit a0c65f9abb239a5a27e3082745c15e8ae19907f5
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 3 14:32:52 2009 +0200
packaging(RHEL-CTDB): package the winbind_krb5_locator.so plugin
Michael
commit e97d6bd520b7624e09b0fb101e6842b9a91ad804
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 3 14:05:42 2009 +0200
packaging(RHEL-CTDB): package the manpage of the winbind_krb5_locator plugin
Michael
commit 2fa621de08364be9b3dea7cce2e4616bfe07d689
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 3 14:04:33 2009 +0200
packaging(RHEL-CTDB): package the manpage of "ldbrename"
Michael
commit 331b816a0bbe5c201edef20d2bb87ef97f9ee206
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 3 14:04:09 2009 +0200
packaging(RHEL-CTDB): package the manpage of "sharesec"
Michael
commit d70f61aa50482dd3fbd8f4f754be92a864233eac
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 3 13:45:40 2009 +0200
packaging(RHEL-CTDB): pam_winbindd man page has moved from section 7 to 8
This due to updating the docs tarball to the 3.4 docs.
Michael
commit 94bcef772d2a78711a345963aa1edc7037d7057d
Author: Michael Adam <obnox at samba.org>
Date: Wed Jul 1 11:06:34 2009 +0200
packaging(RHEL-CTDB): disable the merged build.
Michael
commit 34be433f948e32fec3a01fe138c526671310253d
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:47:45 2009 +0100
packaging(RHEL-CTDB): also pack libwbcient in winbind-32bit package
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 0c4c24a074b7f3aebadbef93733e19312b0c4289
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:30:35 2009 +0100
packaging(RHEL-CTDB): add new pam_winbind.mo to the common package
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit f8772b9beda656bc7520a9d357a2407b08e70061
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:28:36 2009 +0100
packaging(RHEL-CTDB): add new binary sharesec to the client package.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit e364d9c522a2e2585ce8f74ffb5fad68639074f1
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:26:11 2009 +0100
packaging(RHEL-CTDB): add new binary ldbrename to the common rpm
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 5bfcde9f41a87d20490d2d94342892becf90383a
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:07:14 2009 +0200
packaging(RHEL-CTDB): fix location of nsswitch/ directory for install
This has been moved to the top level directory in 3.4.
Michael
commit 58c72fa02ce943bb47287ca53bfb657b0b1e5b26
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:05:00 2009 +0200
packaging(RHEL-CTDB): don't pass CFLAGS to make.
This breaks the build since 3.3 since it overwrites the CFLAGS
set by configure.
Michael
commit c4d02edcbbea076e5ba87c52a27054c497dc6c9b
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:03:09 2009 +0200
packaging(RHEL-CTDB): don't "make proto" any more.
This has become unnecessary in 3.3
Michael
commit c4af2b666b9310693820608b56114bad377d1236
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 23 23:09:09 2009 +0200
packaging(RHEL-CTDB):makerpms.sh: replace source/ by source3/
Michael
commit 1421aad532daf93d213e6c1b74ad00535832ece3
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 23 23:06:40 2009 +0200
packaging(RHEL-CTDB):makespec.sh: fix detection of version
Michael
commit 3a56367867c3578781b8c4ebaf3047c6d5fa3579
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 23 22:41:51 2009 +0200
packaging(RHEL-CTDB): makeversion.sh: v3-4-test uses source3 instead of source
Michael
commit 63d465cdbf522409b6ba9e6507be908d15ac997a
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 09:49:12 2009 +0100
packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build
Michael
(cherry picked from commit a9a506b6640986548e2ae8540b7ae93960d6ece5)
commit 0fa142fd45d09f7b700eb0a4bb984c16ca28a042
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 20 19:47:28 2009 +0100
packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build
Michael
(cherry picked from commit f5cd88a25f360e6609dc5abe24247fab78af6854)
commit fe585b56af225b3bc96eac6b0cd57de4cd305f07
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 11:03:34 2009 +0100
packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from version.h
Michael
(cherry picked from commit fc122aa276bce379b492e5bdf52ab3e03bc3737f)
commit d39a1b4a09e86dd040158d545258507666b3cab1
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 10:24:31 2009 +0100
packaging(RHEL-CTDB): The former release number has basically moved into VERSION
Michael
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL-CTDB/configure.rpm | 1 +
packaging/RHEL-CTDB/makerpms.sh | 17 ++--
packaging/RHEL-CTDB/makespec.sh | 23 +++++-
packaging/RHEL-CTDB/samba.spec.tmpl | 148 +++++++++++++++++++++++++++++-----
4 files changed, 156 insertions(+), 33 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index b9a1ee1..84e7346 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -58,6 +58,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
--without-ldb \
--without-dnsupdate \
--with-aio-support \
+ --disable-merged-build
$*
make showlayout
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 50fa96c..8da9078 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -88,19 +88,20 @@ cp -p ${SPECFILE} ${RPMSPECDIR}
popd
##
-## Build
+## some symlink fixes for building 32bit compat libs
##
-echo "$(basename $0): Getting Ready to build release package"
-pushd ${RPMSPECDIR}
-${RPM} -ba $EXTRA_OPTIONS $SPECFILE
-if [ "x$?" = "x0" ] && [ `arch` = "x86_64" ]; then
- echo "Building 32 bit winbind libs"
- # hi ho, a hacking we will go ...
+if [ `arch` = "x86_64" ]; then
ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so
ln -sf /lib/libuuid.so.1 /lib/libuuid.so
- ${RPM} -ba --rebuild --target=i386 $SPECFILE
fi
+##
+## Build
+##
+echo "$(basename $0): Getting Ready to build release package"
+
+pushd ${RPMSPECDIR}
+${RPM} -ba $EXTRA_OPTIONS $SPECFILE
popd
echo "$(basename $0): Done."
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index ae58db0..29dcbeb 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -6,7 +6,7 @@
DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/../..
-SRCDIR=${TOPDIR}/source
+SRCDIR=${TOPDIR}/source3
VERSION_H=${SRCDIR}/include/version.h
SPECFILE=${DIRNAME}/samba.spec
@@ -21,15 +21,32 @@ if [ ! -f ${VERSION_H} ] ; then
exit 1
fi
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
+VERSION=`grep "^#define SAMBA_VERSION_OFFICIAL_STRING " ${VERSION_H} | awk '{print $3}'`
+vendor_version=`grep "^#define SAMBA_VERSION_VENDOR_SUFFIX " ${VERSION_H} | awk '{print $3}'`
if test "x${vendor_version}" != "x" ; then
VERSION="${VERSION}-${vendor_version}"
fi
+vendor_patch=`grep "^#define SAMBA_VERSION_VENDOR_PATCH " ${VERSION_H} | awk '{print $3}'`
+if test "x${vendor_patch}" != "x" ; then
+ VERSION="${VERSION}-${vendor_patch}"
+fi
VERSION=`echo ${VERSION} | sed 's/-/_/g'`
VERSION=`echo ${VERSION} | sed 's/\"//g'`
echo "VERSION: ${VERSION}"
+
+# to build a release-rpm, set USE_GITHASH="no"
+# in the environmet
+#
+if test "x$USE_GITHASH" = "xno" ; then
+ GITHASH=""
+ echo "GITHASH: not used"
+else
+ GITHASH=".$(git log --pretty=format:%h -1)"
+ echo "GITHASH: ${GITHASH}"
+fi
+
sed -e s/PVERSION/${VERSION}/g \
+ -e s/GITHASH/${GITHASH}/g \
< ${SPECFILE}.tmpl \
> ${SPECFILE}
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index c8f31f3..9ee39cf 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -6,7 +6,7 @@ Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
Version: PVERSION
-Release: ctdb.1
+Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -29,7 +29,7 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, ctdb
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, ctdb, e2fsprogs-devel
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
@@ -43,6 +43,7 @@ BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-deve
%define _libarchdir /usr/%{_libarch}
+%define numcpu %(grep "^processor" /proc/cpuinfo |wc -l | sed -e 's/^0$/1/')
%description
Samba is the protocol by which a lot of PC-related machines share
@@ -93,7 +94,7 @@ The samba-swat package includes the new SWAT (Samba Web Administration
Tool), for remotely managing Samba's smb.conf file using your favorite
Web browser.
-%ifarch i386 i486 i586 i686 ppc s390
+%ifarch x86_64 ppc64
%package winbind-32bit
Summary: Samba winbind compatibility package for 32bit apps on 64bit archs
Group: Applications/System
@@ -129,7 +130,7 @@ utilized by SWAT as well as the HTML and PDF version of "Using Samba",
/bin/cp setup/filter-requires-samba.sh %{SOURCE998}
-cd source
+cd source3
# RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
## check for ccache
@@ -144,6 +145,80 @@ export CC
## always run autogen.sh
./autogen.sh
+
+##
+## build the files for the winbind-32bit compat package
+## and copy them to a safe location
+##
+%ifarch x86_64 ppc64
+
+# a directory to store the 32bit compatibility modules for later install
+%define _32bit_tmp_dir %{_tmppath}/%{name}-%{version}-32bit
+
+CC_SAVE="$CC"
+CC="$CC -m32"
+
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" ./configure \
+ --prefix=%{_prefix} \
+ --localstatedir=/var \
+ --with-configdir=%{_sysconfdir}/samba \
+ --with-libdir=/usr/lib/samba \
+ --with-pammodulesdir=/lib/security \
+ --with-lockdir=/var/lib/samba \
+ --with-logfilebase=/var/log/samba \
+ --with-mandir=%{_mandir} \
+ --with-piddir=/var/run \
+ --with-privatedir=%{_sysconfdir}/samba \
+ --disable-cups \
+ --with-acl-support \
+ --with-ads \
+ --with-automount \
+ --with-fhs \
+ --with-pam_smbpass \
+ --with-libsmbclient \
+ --with-libsmbsharemodes \
+ --without-smbwrapper \
+ --with-pam \
+ --with-quotas \
+ --with-syslog \
+ --with-utmp \
+ --with-cluster-support \
+ --with-ctdb=/usr/include \
+ --without-ldb \
+ --without-dnsupdate \
+ --with-aio-support \
+ --disable-merged-build
+
+make showlayout
+
+## check for gcc 3.4 or later
+CC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
+CC_MAJOR=`echo ${CC_VERSION} | cut -d. -f 1`
+CC_MINOR=`echo ${CC_VERSION} | cut -d. -f 2`
+if [ ${CC_MAJOR} -ge 3 ]; then
+ if [ ${CC_MAJOR} -gt 3 -o ${CC_MINOR} -ge 4 ]; then
+ make pch
+ fi
+fi
+
+make -j%{numcpu} %{?_smp_mflags} \
+ nss_modules pam_modules
+
+rm -rf %{_32bit_tmp_dir}
+mkdir %{_32bit_tmp_dir}
+
+mv ../nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/
+mv bin/pam_winbind.so %{_32bit_tmp_dir}/
+mv bin/libtalloc.so* %{_32bit_tmp_dir}/
+mv bin/libtdb.so* %{_32bit_tmp_dir}/
+mv bin/libwbclient.so* %{_32bit_tmp_dir}/
+
+make clean
+
+CC="$CC_SAVE"
+
+%endif
+
CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--prefix=%{_prefix} \
--localstatedir=/var \
@@ -176,7 +251,8 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--with-ctdb=/usr/include \
--without-ldb \
--without-dnsupdate \
- --with-aio-support
+ --with-aio-support\
+ --disable-merged-build
make showlayout
@@ -191,7 +267,7 @@ if [ ${CC_MAJOR} -ge 3 ]; then
fi
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
+make -j %{numcpu} %{?_smp_mflags} \
all modules pam_smbpass
# Remove some permission bits to avoid to many dependencies
@@ -209,6 +285,7 @@ mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
mkdir -p $RPM_BUILD_ROOT%{_libarchdir}/samba/{auth,charset,idmap,vfs,pdb}
mkdir -p $RPM_BUILD_ROOT/%{_libarch}/security
+mkdir -p $RPM_BUILD_ROOT/lib/security
mkdir -p $RPM_BUILD_ROOT%{_mandir}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/{bin,sbin}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
@@ -220,23 +297,40 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{samba,sysconfig}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
mkdir -p $RPM_BUILD_ROOT/var/{log,run/winbindd,spool}/samba
+mkdir -p $RPM_BUILD_ROOT/%{_libarchdir}/krb5/plugins/libkrb5
-cd source
+cd source3
make DESTDIR=$RPM_BUILD_ROOT \
install
cd ..
# NSS winbind support
-install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
( cd $RPM_BUILD_ROOT/%{_libarch};
ln -sf libnss_winbind.so.2 libnss_winbind.so )
#
# do not install libnss_wins.so in order to reduce dependencies
# (we do not need it for the samba-ctdb scenario)
#
-#install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
+#install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
# ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so libnss_wins.so.2 )
+cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/plugins/libkrb5
+
+# install files for winbind-32bit package
+%ifarch x86_64 ppc64
+
+install -m 755 %{_32bit_tmp_dir}/libnss_winbind.so ${RPM_BUILD_ROOT}/lib/libnss_winbind.so.2
+( cd ${RPM_BUILD_ROOT}/lib; ln -sf libnss_winbind.so.2 libnss_winbind.so )
+
+mv %{_32bit_tmp_dir}/libtalloc* ${RPM_BUILD_ROOT}/usr/lib
+mv %{_32bit_tmp_dir}/libtdb* ${RPM_BUILD_ROOT}/usr/lib
+mv %{_32bit_tmp_dir}/libwbclient* ${RPM_BUILD_ROOT}/usr/lib
+mv %{_32bit_tmp_dir}/pam_winbind.so ${RPM_BUILD_ROOT}/lib/security
+
+rm -rf %{_32bit_tmp_dir}
+
+%endif
## cleanup
/bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
@@ -253,9 +347,9 @@ install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
-install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
@@ -363,8 +457,6 @@ exit 0
%{_bindir}/tdbdump
%{_bindir}/eventlogadm
-%{_libarchdir}/samba/idmap/*.so
-%{_libarchdir}/samba/nss_info/*.so
%{_libarchdir}/samba/vfs/*.so
%{_libarchdir}/samba/auth/*.so
@@ -381,7 +473,6 @@ exit 0
%{_mandir}/man8/tdbtool.8*
%{_mandir}/man8/eventlogadm.8*
%{_mandir}/man8/vfs_*.8*
-%{_mandir}/man8/idmap_*.8*
##########
@@ -424,6 +515,7 @@ exit 0
%{_bindir}/smbspool
%{_bindir}/smbtar
%{_bindir}/smbtree
+%{_bindir}/sharesec
%{_mandir}/man8/mount.cifs.8.*
%{_mandir}/man8/umount.cifs.8.*
@@ -438,6 +530,7 @@ exit 0
%{_mandir}/man1/smbclient.1*
%{_mandir}/man1/smbtar.1*
%{_mandir}/man1/smbtree.1*
+%{_mandir}/man1/sharesec.1*
##########
@@ -454,6 +547,10 @@ exit 0
%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
+/usr/share/locale/*/LC_MESSAGES/pam_winbind.mo
+
+%{_libarchdir}/samba/idmap/*.so
+%{_libarchdir}/samba/nss_info/*.so
%{_includedir}/libsmbclient.h
%{_libarchdir}/libsmbclient.*
@@ -474,6 +571,8 @@ exit 0
%{_libarchdir}/libtdb.so*
%{_libarchdir}/libwbclient.so*
+%{_libarchdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
+
%{_sbindir}/winbind
%{_sbindir}/winbindd
@@ -486,6 +585,7 @@ exit 0
%{_bindir}/ldbedit
%{_bindir}/ldbmodify
%{_bindir}/ldbsearch
+%{_bindir}/ldbrename
%{_bindir}/wbinfo
%{_bindir}/ntlm_auth
%{_bindir}/pdbedit
@@ -501,21 +601,25 @@ exit 0
%{_mandir}/man1/wbinfo.1*
%{_mandir}/man8/winbindd.8*
%{_mandir}/man8/net.8*
-%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man8/pam_winbind.8*
%{_mandir}/man7/libsmbclient.7*
%{_mandir}/man1/ldbadd.1*
%{_mandir}/man1/ldbdel.1*
%{_mandir}/man1/ldbedit.1*
%{_mandir}/man1/ldbmodify.1*
%{_mandir}/man1/ldbsearch.1*
+%{_mandir}/man1/ldbrename.1*
+%{_mandir}/man7/winbind_krb5_locator.7*
+%{_mandir}/man8/idmap_*.8*
-%ifarch i386 i486 i586 i686 ppc s390
+%ifarch x86_64 ppc64
%files winbind-32bit
-%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
-#%attr(755,root,root) /%{_libarch}/libnss_wins.so*
-%attr(755,root,root) /%{_libarchdir}/libtalloc.so*
-%attr(755,root,root) /%{_libarchdir}/libtdb.so*
-%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
+%attr(755,root,root) /lib/libnss_winbind.so*
+#%attr(755,root,root) /lib/libnss_wins.so*
+%attr(755,root,root) /usr/lib/libtalloc.so*
+%attr(755,root,root) /usr/lib/libtdb.so*
+%attr(755,root,root) /usr/lib/libwbclient.so*
+%attr(755,root,root) /lib/security/pam_winbind.so
%endif
--
Samba Shared Repository
More information about the samba-cvs
mailing list