diff options
| -rw-r--r-- | MAINTAINERS | 11 | ||||
| -rw-r--r-- | packaging/Fedora/samba.spec.tmpl | 12 | ||||
| -rw-r--r-- | packaging/Solaris/makepkg.sh | 2 | ||||
| -rwxr-xr-x | source3/script/installman.sh | 5 |
4 files changed, 17 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b84f01b519..9f67bf945d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21,10 +21,19 @@ Feature/Function Developer ---------------- --------- documentation John Terpstra <jht@samba.org> + libmsrpc Chris Nichols <skel@samba.org> + libsmbclient Derrell Lipman <derrell@samba.org> -pdb_mysql Jelmer Vernooij <jelmer@samba.org> + +pdb_*sql <samba-pdbsql@samba.org> + Peter Rindfuss: pdb_mysql + Darrell McGuire: pdb_mysql + Ulrich Meis: pdb_pgsql + Filip Jirsák: pdb_pgsql + printing Gerald (Jerry) Carter <jerry@samba.org> + samba-vscan Rainer Link <rainer@openantivirus.org> diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl index 7d494d1a65..bac333699f 100644 --- a/packaging/Fedora/samba.spec.tmpl +++ b/packaging/Fedora/samba.spec.tmpl @@ -213,12 +213,9 @@ install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba ## ## Clean out man pages for tools not installed here ## -rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1* 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}/man1/testprns.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/vfstest.1* %clean rm -rf $RPM_BUILD_ROOT @@ -343,12 +340,15 @@ fi %{_mandir}/man8/umount.cifs.8.* %{_mandir}/man8/smbspool.8* %{_bindir}/nmblookup +%{_bindir}/smbget %{_bindir}/smbclient %{_bindir}/smbprint %{_bindir}/smbspool %{_bindir}/smbtar %{_bindir}/net %{_bindir}/smbtree +%{_mandir}/man1/smbget.1* +%{_mandir}/man5/smbgetrc.5* %{_mandir}/man1/findsmb.1* %{_mandir}/man1/nmblookup.1* %{_mandir}/man1/rpcclient.1* @@ -377,15 +377,12 @@ fi %{_libdir}/samba/auth/script.so %{_bindir}/testparm %{_bindir}/smbpasswd -# %{_bindir}/make_printerdef %{_bindir}/wbinfo -# %{_bindir}/editreg %{_bindir}/ntlm_auth %{_bindir}/pdbedit %{_bindir}/eventlogadm %{_bindir}/profiles %{_bindir}/smbcquotas -#%{_bindir}/vfstest %{_sbindir}/winbindd %config(noreplace) %{_sysconfdir}/samba/smb.conf %config(noreplace) %{_sysconfdir}/samba/lmhosts @@ -404,7 +401,6 @@ fi %{_mandir}/man8/smbpasswd.8* %{_mandir}/man1/wbinfo.1* %{_mandir}/man8/winbindd.8* -%{_mandir}/man1/vfstest.1* %changelog * Fri Jan 16 2004 Gerald (Jerry) Carter <jerry@samba,org> diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh index aaa06c4af4..2d599fca9b 100644 --- a/packaging/Solaris/makepkg.sh +++ b/packaging/Solaris/makepkg.sh @@ -14,7 +14,7 @@ MSGFILES="de.msg en.msg fr.msg it.msg ja.msg nl.msg pl.msg tr.msg" VFSLIBS="audit.so default_quota.so extd_audit.so full_audit.so readonly.so shadow_copy.so cap.so expand_msdfs.so fake_perms.so netatalk.so recycle.so" DATFILES="lowcase.dat upcase.dat valid.dat" CHARSETLIBS="CP437.so CP850.so" -AUTHLIBS="auth_script.so" +AUTHLIBS="script.so" add_dynamic_entries() { diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 3bbca1a8aa..9235217ff0 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -19,8 +19,7 @@ if test ! -d $SRCDIR../docs/manpages; then fi # Get the configured feature set -test -f "${SRCDIR}/config.log" && \ - eval $( grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log") +test -f "${SRCDIR}/config.log" && eval `grep '^[A-Za-z0-9]*=.*' ${SRCDIR}/config.log` for lang in $langs; do if [ "X$lang" = XC ]; then @@ -44,7 +43,7 @@ for lang in $langs; do for sect in 1 5 7 8 ; do for m in $langdir/man$sect ; do for s in $SRCDIR../docs/manpages/$lang/*$sect; do - MP_BASENAME=${s##*/} + MP_BASENAME=`basename $s` # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in |