summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-12-17 18:56:34 +0100
committerKarolin Seeger <kseeger@samba.org>2009-01-02 14:38:01 +0100
commit308dbca653ce1d689b75f9b781237c67df4233a8 (patch)
treed2e270ce76f328af2b2b379a6d416c8729f118d2
parent8b81e7c7c65f3923aaa7a366733000517b44756e (diff)
downloadsamba-308dbca653ce1d689b75f9b781237c67df4233a8.tar.gz
samba-308dbca653ce1d689b75f9b781237c67df4233a8.tar.bz2
samba-308dbca653ce1d689b75f9b781237c67df4233a8.zip
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything. And it needs extra objects anyways (mtab.o), which is why the build of mount.cifs failed. Michael (cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1) Signed-off-by: Michael Adam <obnox@samba.org>
-rw-r--r--packaging/RHEL/samba.spec.tmpl10
1 files changed, 2 insertions, 8 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 92030fcd6b..64f8988a5f 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -178,12 +178,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
@@ -238,8 +232,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 bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 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