diff options
| author | Jeremy Allison <jra@samba.org> | 2008-12-17 17:24:54 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-12-17 17:24:54 -0800 |
| commit | f00d9cbfd752b6971e010a07d80937b322149520 (patch) | |
| tree | 23bcdf13441502c80fdaa28250cf6bc3525ab574 | |
| parent | 1a5fc6d4bc847d9896500b704c9a8d5ac7faa7d2 (diff) | |
| parent | 8f2e7041a0ab94db88b5693f48455724e76261c6 (diff) | |
| download | samba-f00d9cbfd752b6971e010a07d80937b322149520.tar.gz samba-f00d9cbfd752b6971e010a07d80937b322149520.tar.bz2 samba-f00d9cbfd752b6971e010a07d80937b322149520.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
| -rwxr-xr-x | packaging/RHEL-CTDB/makespec.sh | 3 | ||||
| -rw-r--r-- | packaging/RHEL-CTDB/samba.spec.tmpl | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh index 7d10d55ab4..ae58db0d85 100755 --- a/packaging/RHEL-CTDB/makespec.sh +++ b/packaging/RHEL-CTDB/makespec.sh @@ -22,8 +22,7 @@ if [ ! -f ${VERSION_H} ] ; then fi VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'` -vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print -$3}'` +vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'` if test "x${vendor_version}" != "x" ; then VERSION="${VERSION}-${vendor_version}" fi diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 8a583a9bde..4806d9f656 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -192,12 +192,6 @@ fi make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \ all modules pam_smbpass -## build the cifs fs mount helper -cd client -gcc -o mount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c -gcc -o umount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c -cd .. - # Remove some permission bits to avoid to many dependencies cd .. find examples docs -type f | xargs -r chmod -x @@ -257,8 +251,8 @@ 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/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs -install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs +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} /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs |