summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-01-16 02:20:27 +0000
committerGerald Carter <jerry@samba.org>2003-01-16 02:20:27 +0000
commitf0e282ebf3e459c559bfc08f3e21fdebb2515621 (patch)
tree7354553c74824f0ef50f08264b80cc6a8dfed363 /packaging
parent078468a1474ec09b11b43c808852feca8df32f1a (diff)
downloadsamba-f0e282ebf3e459c559bfc08f3e21fdebb2515621.tar.gz
samba-f0e282ebf3e459c559bfc08f3e21fdebb2515621.tar.bz2
samba-f0e282ebf3e459c559bfc08f3e21fdebb2515621.zip
* merge fixes for SGML syntax errors (does no one ever regenerate the docs?)
* regenerate the docs * add some files from SAMBA_3_0 (This used to be commit 1af74785f334bd84b2d62e7fc2975f9477386acb)
Diffstat (limited to 'packaging')
-rw-r--r--packaging/Caldera/OpenLinux/samba3.spec.tmpl60
-rw-r--r--packaging/Mandrake/makerpms-cvs.sh4
-rw-r--r--packaging/Mandrake/samba2.spec.tmpl30
-rw-r--r--packaging/Mandrake/winbind.init2
4 files changed, 56 insertions, 40 deletions
diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index 8bdc4eb0d7..f5c9071591 100644
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -23,6 +23,7 @@ BuildRoot : /tmp/%{Name}-%{Version}
Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz
+
%Package doc
Group : Server/Network
@@ -170,7 +171,6 @@ a clean and stable API for SMB client application development.
%Prep
%setup
-
for i in {cvs.,change-}log; do [ ! -f ../$i ] || mv ../$i source; done
mv swat/help/welcome.html docs
@@ -200,13 +200,14 @@ rm configure
autoconf
CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
- --prefix='$(DESTDIR)/usr' \
- --localstatedir='$(DESTDIR)/var' \
- --libdir='$(DESTDIR)%{EtcSamba}' \
- --sbindir='$(DESTDIR)/usr/sbin' \
+ --prefix=/usr \
+ --localstatedir=/var \
+ --libdir=/usr/lib/samba \
+ --sbindir=/usr/sbin \
+ --with-configdir='%{EtcSamba}' \
--with-privatedir='$(LIBDIR)' \
- --with-lockdir='$(DESTDIR)/var/lock/samba.d' \
- --with-swatdir='$(DESTDIR)/usr/share/swat' \
+ --with-lockdir=/var/lock/samba.d \
+ --with-swatdir=/usr/share/swat \
--with-smbmount \
--with-pam \
--with-tdbsam \
@@ -223,43 +224,30 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
--with-smbwrapper \
--with-libsmbclient \
--with-acl-support \
- --with-sambabook=$(DESTDIR)/usr/share/swat/using_samba
-
-# Temp disabled - add later - JHT
-# --with-pam_smbpass \
-# --with-nisplus-home \
+ --with-sambabook=/usr/share/swat/using_samba
-make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so everything
+make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so modules everything pam_smbpass
(cd tdb; make tdbdump tdbtest tdbtorture tdbtool)
-cd ../examples/VFS
-#CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
-# --prefix='$(DESTDIR)/usr' \
-# --localstatedir='$(DESTDIR)/var' \
-# --libdir='$(DESTDIR)%{EtcSamba}' \
-# --sbindir='$(DESTDIR)/usr/sbin'
-make
-
%Install
%{mkDESTDIR}
VVS=packaging/%{Vendor}/%{Dist}
mkdir -p $DESTDIR/etc/{{rc.d/init,logrotate,pam}.d,sysconfig/daemons}
-mkdir -p $DESTDIR%{EtcSamba}/codepages/src
+mkdir -p $DESTDIR%{EtcSamba}
mkdir -p $DESTDIR/etc/skel/Samba
mkdir -p $DESTDIR/home/samba
mkdir -p $DESTDIR/lib/security
-mkdir -p $DESTDIR/lib/samba
mkdir -p $DESTDIR/%{LSBservedir}/{netlogon,profiles,Public}
mkdir -p $DESTDIR%{NKinetdir}
mkdir -p $DESTDIR/{sbin,bin,usr/{sbin,bin}}
mkdir -p $DESTDIR/%{SVIdir}
-mkdir -p $DESTDIR/usr/{include,lib}
+mkdir -p $DESTDIR/usr/{include,lib/samba/vfs}
mkdir -p $DESTDIR/usr/share/samba/codepages/src
mkdir -p $DESTDIR/usr/share/swat/using_samba/{gifs,figs}
mkdir -p $DESTDIR/var/{lo{ck,g}/samba.d,spool/samba}
-make -C source install installclientlib
+make -C source DESTDIR=$RPM_BUILD_ROOT install-everything installclientlib
strip $DESTDIR/usr/bin/smb{mount,mnt,umount}
# Add links for mount.smbfs
@@ -281,29 +269,24 @@ do
install -m 755 source/tdb/$i $DESTDIR/usr/sbin
done
-# Add VFS Modules
-for i in audit.so recycle.so netatalk.so skel.so
-do
- install -m755 examples/VFS/$i $DESTDIR/lib/samba
-done
-
-#mv $DESTDIR/usr/bin/{make,add,conv}* $DESTDIR/usr/sbin
-
-#cp -p source/codepages/codepage_def.??? $DESTDIR%{EtcSamba}/codepages/src
-
# Install the nsswitch library extension file
cp -p source/nsswitch/libnss_wins.so $DESTDIR/lib
cp -p source/nsswitch/libnss_winbind.so $DESTDIR/lib
cp -p source/nsswitch/pam_winbind.so $DESTDIR/lib/security
+cp -p source/bin/pam_smbpass.so $DESTDIR/lib/security
# Make link for wins resolver
( cd $DESTDIR/lib; ln -s libnss_wins.so libnss_wins.so.2 )
# Add libsmbclient.a support stuff
install -m 755 source/bin/libsmbclient.a $DESTDIR/usr/lib
+# Add smbwrapper support
+install -m 755 source/bin/smbsh $DESTDIR/usr/bin
+install -m 755 source/bin/smbwrapper.so $DESTDIR/usr/lib
+
+# Ancilliary support files
cp -p $VVS/samba.init $DESTDIR/etc/rc.d/init.d/samba
ln -s /etc/rc.d/init.d/samba $DESTDIR/usr/sbin
-
cp -p $VVS/smb.conf.sample $DESTDIR%{EtcSamba}/smb.conf.sample
cp -p $VVS/smbusers $DESTDIR%{EtcSamba}
cp -p $VVS/findsmb $DESTDIR/usr/bin
@@ -385,6 +368,10 @@ Samba/README.txt base
%{_defaultdocdir}/samba-[^/]+/(COPYING|README$) base
libnss_* base
pam_* base
+vfs_* base
+pdb_* base
+smbsh base
+smbwrapper.so base
%{_defaultdocdir}/samba-[^/]+/(COPYING|README$) base
%{_defaultdocdir}/samba- doc
smb(mount|mnt|umount) smbfs
@@ -401,6 +388,7 @@ EOF
%Post
/usr/lib/LSB/init-install %{Name}
+ldconfig
%Post -n swat
%{NKinetdReload}
diff --git a/packaging/Mandrake/makerpms-cvs.sh b/packaging/Mandrake/makerpms-cvs.sh
index 0faaf4d0ba..72c75b772b 100644
--- a/packaging/Mandrake/makerpms-cvs.sh
+++ b/packaging/Mandrake/makerpms-cvs.sh
@@ -5,8 +5,8 @@
[ $# -lt 1 ] && echo "Usage: $0 <Samba version>" && exit 1
-VERSION=$1cvs
-RELEASE=`date +%Y%m%d`
+VERSION=$1
+RELEASE=0.`date +%Y%m%d`
shift
# Replace PRELEASE and PVERSION with release number in all files ending with
diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl
index ffec867ce3..e21a148486 100644
--- a/packaging/Mandrake/samba2.spec.tmpl
+++ b/packaging/Mandrake/samba2.spec.tmpl
@@ -172,6 +172,7 @@ Group: System/Servers
Source: ftp://samba.org/pub/samba/samba-%{source_ver}.tar.bz2
URL: http://www.samba.org
Source1: samba.log
+Source2: mount.smb
Source3: samba.xinetd
Source4: swat_48.xpm.bz2
Source5: swat_32.xpm.bz2
@@ -182,9 +183,21 @@ Source8: samba-vscan-%{vscanver}.tar.bz2
%endif
Source10: samba-print-pdf.sh.bz2
Patch1: smbw.patch.bz2
+Patch2: samba-glibc21.patch.bz2
+#Patch3: network-recycle_bin.patch.bz2
Patch5: samba-2.2.0-gawk.patch.bz2
Patch12: samba-2.2.0-buildroot.patch.bz2
+#Patch16: samba-mkdir.patch.bz2
Patch17: samba-3.0-smbmount-sbin.patch.bz2
+#Patches 20-22 to get packaging synced from 2.2.2 to 3.0
+Patch20: samba-3.0-smb.conf.patch.bz2
+Patch21: samba-3.0-winbind.init.patch.bz2
+Patch22: samba-3.0-system-auth-winbind.patch.bz2
+Patch23: samba-3alpha20-destdir.patch.bz2
+#Patch24: samba-3.0alpha13-installman.patch.bz2
+Patch25: samba-3.0alpha13-config_lang.patch.bz2
+#Patch 26 belongs with 20-22
+Patch26: samba-3.0-smb.init.patch.bz2
Requires: pam >= 0.64, samba-common = %{version}
BuildRequires: pam-devel autoconf readline-devel
%if %build_acl
@@ -536,10 +549,20 @@ echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7}
%else
%setup -q -n %{pkg_name}-%{source_ver}
%endif
+#%patch111 -p1
%patch1 -p1 -b .smbw
+#%patch3 -p1 -b .net-r_bin
%patch5 -p1 -b .gawk
+#%patch6 -p1
%patch12 -p1 -b .buildroot
%patch17 -p1 -b .sbin
+%patch20 -p1 -b .samba222
+%patch21 -p1 -b .samba222
+%patch22 -p1 -b .samba222
+%patch23 -p1 -b .destdir
+#%patch24 -p1 -b .langen
+%patch25 -p1 -b .multilang
+%patch26 -p1 -b .samba222
cp %{SOURCE7} .
# Make a copy of examples so that we have a clean one for doc:
@@ -1024,7 +1047,7 @@ fi
%dir /var/log/%{name}
%attr(1777,root,root) %dir /var/spool/%{name}
%dir %{_datadir}/%{name}/scripts
-%attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf
+#%attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf
#%attr(0750,root,root) %{_datadir}/%{name}/scripts/smbldap*.pl
#%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/smbldap_conf.pm
#%attr(0644,root,root) %{_datadir}/%{name}/scripts/smbldap_tools.pm
@@ -1086,8 +1109,11 @@ fi
%dir /var/cache/%{name}
%dir /var/log/%{name}
%dir /var/run/%{name}
+#%{_bindir}/make_smbcodepage
+#%{_bindir}/make_unicodemap
%{_bindir}/testparm%{samba_major}
%{_bindir}/testprns%{samba_major}
+#%{_bindir}/make_printerdef
%{_bindir}/rpcclient%{samba_major}
%{_bindir}/smbsh%{samba_major}
%{_bindir}/smbpasswd%{samba_major}
@@ -1098,6 +1124,8 @@ fi
%attr(-,root,root) %config(noreplace) /etc/%{name}/smb-winbind.conf
%attr(-,root,root) %config(noreplace) /etc/%{name}/lmhosts
%attr(-,root,root) /var/lib/%{name}/codepages
+%{_mandir}/man1/make_smbcodepage*.1*
+%{_mandir}/man1/make_unicodemap*.1*
%{_mandir}/man1/testparm*.1*
%{_mandir}/man1/smbsh*.1*
%{_mandir}/man1/testprns*.1*
diff --git a/packaging/Mandrake/winbind.init b/packaging/Mandrake/winbind.init
index 13ddb392d7..b7b452eb0b 100644
--- a/packaging/Mandrake/winbind.init
+++ b/packaging/Mandrake/winbind.init
@@ -83,7 +83,7 @@ case "$1" in
mdkstatus
;;
condrestart)
- [ -f /var/lock/subsys/winbind ] && restart || :
+ [ -f /var/lock/subsys/winbindd ] && restart || :
;;
*)
echo "Usage: $0 {start|stop|restart|status|condrestart}"