r10960: merging changes to specfile from 3.0.20b release

[tprouty/samba.git] / packaging / Fedora / samba.spec.tmpl

diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl
index f587232a0cdb748cae8b9ac0baa2424a36de0495..a5da445053f2f4f4fc1128d38edb883d68d7a2e8 100644 (file)
--- a/packaging/Fedora/samba.spec.tmpl
+++ b/packaging/Fedora/samba.spec.tmpl
@@ -32,7 +32,7 @@ Requires: logrotate >= 3.4 initscripts >= 5.54-1
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
 Prereq: fileutils sed /etc/init.d 
-BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel, openldap-devel, krb5-devel
+BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
 
 
 # Working around perl dependency problem from docs
@@ -120,10 +120,16 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
        --with-sambabook=%{_datadir}/swat/using_samba \
        --with-swatdir=%{_datadir}/swat \
        --with-libsmbclient \
-       --with-acl-support 
+       --with-acl-support \
+       --with-shared-modules=idmap_rid \
+       --enable-cups=yes
 make showlayout
 make proto
-make %{?_smp_mflags} all nsswitch/libnss_wins.so debug2html 
+make %{?_smp_mflags} all modules nsswitch/libnss_wins.so 
+
+## build the cifs fs mount helper
+gcc  -o mount.cifs $RPM_OPT_FLAGS -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE client/mount.cifs.c
+gcc  -o umount.cifs $RPM_OPT_FLAGS -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE client/umount.cifs.c
 
 
 %install
@@ -151,6 +157,8 @@ install -m755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}
 install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/samba
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/samba
 install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m755 source/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 
 install -m755 %{SOURCE5} $RPM_BUILD_ROOT%{initdir}/smb
 install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{initdir}/winbind
@@ -202,7 +210,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/testprns.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -265,13 +273,13 @@ fi
 %doc examples/printing
 
 %attr(755,root,root) /%{_lib}/security/pam_smbpass.so
+%{_sbindir}/samba
+%{_sbindir}/winbind
 %{_sbindir}/smbd
 %{_sbindir}/nmbd
-# %{_bindir}/make_unicodemap
 %{_bindir}/mksmbpasswd.sh
 %{_bindir}/smbcontrol
 %{_bindir}/smbstatus
-# %{_bindir}/smbadduser
 %{_bindir}/tdbbackup
 %{_bindir}/tdbtool
 %config(noreplace) %{_sysconfdir}/sysconfig/samba
@@ -279,7 +287,6 @@ fi
 %attr(755,root,root) %config %{initdir}/smb
 %config(noreplace) %{_sysconfdir}/logrotate.d/samba
 %config(noreplace) %{_sysconfdir}/pam.d/samba
-# %{_mandir}/man1/make_unicodemap.1*
 %{_mandir}/man1/smbcontrol.1*
 %{_mandir}/man1/smbstatus.1*
 %{_mandir}/man5/smbpasswd.5*
@@ -289,11 +296,8 @@ fi
 %{_mandir}/man8/smbd.8*
 %{_mandir}/man8/pam_winbind.8*
 %{_mandir}/man8/tdbbackup.8*
-#%{_mandir}/ja/man1/smbstatus.1*
-#%{_mandir}/ja/man5/smbpasswd.5*
-#%{_mandir}/ja/man7/samba.7*
-#%{_mandir}/ja/man8/smbd.8*
-#%{_mandir}/ja/man8/nmbd.8*
+%{_mandir}/man8/libsmbclient.8*
+
 %{_libdir}/samba/vfs
 
 %attr(0700,root,root) %dir /var/log/samba
@@ -305,13 +309,14 @@ fi
 %{_datadir}/swat
 %{_sbindir}/swat
 %{_mandir}/man8/swat.8*
-#%{_mandir}/ja/man8/swat.8*
 %attr(755,root,root) %{_libdir}/samba/*.msg
 
 %files client
 %defattr(-,root,root)
 /sbin/mount.smb
 /sbin/mount.smbfs
+/sbin/mount.cifs
+/sbin/umount.cifs
 %{_libdir}/samba/lowcase.dat
 %{_libdir}/samba/upcase.dat
 %{_libdir}/samba/valid.dat
@@ -326,6 +331,8 @@ fi
 %{_mandir}/man8/smbmnt.8*
 %{_mandir}/man8/smbmount.8*
 %{_mandir}/man8/smbumount.8*
+%{_mandir}/man8/mount.cifs.8.*
+%{_mandir}/man8/umount.cifs.8.*
 %{_mandir}/man8/smbspool.8*
 %{_bindir}/nmblookup
 %{_bindir}/smbclient
@@ -354,9 +361,9 @@ fi
 %{_libdir}/libsmbclient.a
 %{_libdir}/libsmbclient.so
 %{_libdir}/samba/charset/CP*.so
+%{_libdir}/samba/idmap/idmap*.so
 %{_includedir}/libsmbclient.h
 %{_bindir}/testparm
-%{_bindir}/testprns
 %{_bindir}/smbpasswd
 # %{_bindir}/make_printerdef
 %{_bindir}/wbinfo
@@ -379,7 +386,6 @@ fi
 %{_mandir}/man1/profiles.1*
 %{_mandir}/man1/smbcquotas.1*
 %{_mandir}/man1/testparm.1*
-%{_mandir}/man1/testprns.1*
 %{_mandir}/man5/smb.conf.5*
 %{_mandir}/man5/lmhosts.5*
 %{_mandir}/man8/smbpasswd.8*
@@ -387,13 +393,6 @@ fi
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man1/vfstest.1*
 
-# #%lang(ja) %{_mandir}/ja/man1/make_smbcodepage.1*
-#%lang(ja) %{_mandir}/ja/man1/testparm.1*
-#%lang(ja) %{_mandir}/ja/man1/testprns.1*
-#%lang(ja) %{_mandir}/ja/man5/smb.conf.5*
-#%lang(ja) %{_mandir}/ja/man5/lmhosts.5*
-#%lang(ja) %{_mandir}/ja/man8/smbpasswd.8*
-
 %changelog
 * Fri Jan 16 2004 Gerald (Jerry) Carter <jerry@samba,org>
 - Removed ChangeLog entries since they are kept in CVS