svn commit: samba r12040 - in branches/SAMBA_3_0: . packaging/Fedora packaging/Solaris source/bin source/script

[jerry at samba.org]

Author: jerry
Date: 2005-12-03 01:03:16 +0000 (Sat, 03 Dec 2005)
New Revision: 12040

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12040

Log:
merging packaging fixes from release branch
Modified:
   branches/SAMBA_3_0/MAINTAINERS
   branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
   branches/SAMBA_3_0/packaging/Solaris/makepkg.sh
   branches/SAMBA_3_0/source/bin/
   branches/SAMBA_3_0/source/script/installman.sh


Changeset:
Modified: branches/SAMBA_3_0/MAINTAINERS
===================================================================
--- branches/SAMBA_3_0/MAINTAINERS	2005-12-03 00:52:34 UTC (rev 12039)
+++ branches/SAMBA_3_0/MAINTAINERS	2005-12-03 01:03:16 UTC (rev 12040)
@@ -21,10 +21,19 @@
 ----------------	---------
 
 documentation 		John Terpstra <jht at samba.org>
+
 libmsrpc		Chris Nichols <skel at samba.org>
+
 libsmbclient		Derrell Lipman <derrell at samba.org>
-pdb_mysql		Jelmer Vernooij <jelmer at samba.org>
+
+pdb_*sql		<samba-pdbsql at samba.org>
+			Peter Rindfuss: pdb_mysql
+			Darrell McGuire: pdb_mysql
+			Ulrich Meis: pdb_pgsql 
+			Filip Jirsák: pdb_pgsql
+
 printing		Gerald (Jerry) Carter <jerry at samba.org>
+
 samba-vscan		Rainer Link <rainer at openantivirus.org>
 
 

Modified: branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
===================================================================
--- branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl	2005-12-03 00:52:34 UTC (rev 12039)
+++ branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl	2005-12-03 01:03:16 UTC (rev 12040)
@@ -213,12 +213,9 @@
 ##
 ## 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 @@
 %{_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 @@
 %{_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 @@
 %{_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 at samba,org>

Modified: branches/SAMBA_3_0/packaging/Solaris/makepkg.sh
===================================================================
--- branches/SAMBA_3_0/packaging/Solaris/makepkg.sh	2005-12-03 00:52:34 UTC (rev 12039)
+++ branches/SAMBA_3_0/packaging/Solaris/makepkg.sh	2005-12-03 01:03:16 UTC (rev 12040)
@@ -14,7 +14,7 @@
 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() 
 {


Property changes on: branches/SAMBA_3_0/source/bin
___________________________________________________________________
Name: svn:ignore
   - *

   + *.so
*.a
.dummy
.libs
debug2html
editreg
locktest
locktest2
log2pcap
make_printerdef
make_smbcodepage
make_unicodemap
masktest
msgtest
net
nmbd
nmblookup
nsstest
ntlm_auth
pdbedit
profiles
rpcclient
samsync
samtest
smbcacls
smbcacls
smbclient
smbcontrol
smbcquotas
smbd
smbfilter
smbget
smbgroupedit
smbiconv
smbmnt
smbmount
smbpasswd
smbsh
smbspool
smbstatus
smbtorture
smbtree
smbumount
swat
t_push_ucs2
t_snprintf
t_strcmp
t_stringoverflow
talloctort
tdbbackup
tdbdump
tdbtool
testparm
testprns
vfstest
wbinfo
winbindd
wrepld
eventlogadm


Modified: branches/SAMBA_3_0/source/script/installman.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installman.sh	2005-12-03 00:52:34 UTC (rev 12039)
+++ branches/SAMBA_3_0/source/script/installman.sh	2005-12-03 01:03:16 UTC (rev 12040)
@@ -19,8 +19,7 @@
 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 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