diff options
| author | Michael Adam <obnox@samba.org> | 2008-12-17 18:56:34 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-01-28 09:39:54 +0100 |
| commit | 5acce3c319a2e89591dbf614c7e97fe75dcdf04c (patch) | |
| tree | 718565950909a8a61e1b7b4a891df97b09a70ef9 /packaging | |
| parent | 82cd6879b2f7403cd89ef4ae7173086620ebdb50 (diff) | |
| download | samba-5acce3c319a2e89591dbf614c7e97fe75dcdf04c.tar.gz | |
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>
(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
(cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
(cherry picked from commit 1c1e196b648ae3ef241401f859842450c5153181)
(cherry picked from commit cd796359ec0c30a0204fe744805bfbea3550f57d)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RHEL/samba.spec.tmpl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index 49a01090e81..1e431165927 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -179,12 +179,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 @@ -251,8 +245,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 |