1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

JHT ==> Updating RPM build file, more expected - so please ignore!

This commit is contained in:
John Terpstra 0001-01-01 00:00:00 +00:00
parent 9385ae1005
commit 4fd3f5e266
2 changed files with 86 additions and 125 deletions

View File

@ -1,121 +1,81 @@
*** samba-1.9.17a1/source/Makefile.orig Sun May 11 22:44:55 1997 --- samba-1.9.17/source/Makefile.orig Fri Jul 4 07:22:06 1997
--- samba-1.9.17a1/source/Makefile Sun May 11 22:51:53 1997 +++ samba-1.9.17/source/Makefile Fri Jul 4 07:27:17 1997
*************** @@ -5,16 +5,16 @@
*** 5,20 ****
# The base manpages directory to put the man pages in # The base manpages directory to put the man pages in
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
! MANDIR = /usr/local/man -MANDIR = /usr/local/man
+MANDIR = /usr/man
# The directories to put things in. If you use multiple # The directories to put things in. If you use multiple
# architectures or share the samba binaries across NFS then # architectures or share the samba binaries across NFS then
# you will probably want to change this layout. # you will probably want to change this layout.
! BASEDIR = /usr/local/samba -BASEDIR = /usr/local/samba
! BINDIR = /usr/local/bin -BINDIR = /usr/local/bin
! SBINDIR = $(BASEDIR)/bin -SBINDIR = $(BASEDIR)/bin
! LIBDIR = $(BASEDIR)/lib -LIBDIR = $(BASEDIR)/lib
! VARDIR = $(BASEDIR)/var -VARDIR = $(BASEDIR)/var
+BASEDIR = /usr
+BINDIR = $(BASEDIR)/bin
+SBINDIR = $(BASEDIR)/sbin
+LIBDIR = /etc
+VARDIR = /var
# The permissions to give the executables # The permissions to give the executables
INSTALLPERMS = 0755 INSTALLPERMS = 0755
--- 5,20 ---- @@ -23,13 +23,13 @@
# add -DSYSLOG for syslog support
# RPM_OPT_FLAGS is needed when building an RPM distribution package
# for RedHat Linux.
-# FLAGS1 = $(RPM_OPT_FLAGS)
-FLAGS1 = -O
+FLAGS1 = $(RPM_OPT_FLAGS)
+# FLAGS1 = -O
LIBS1 =
# The base manpages directory to put the man pages in # You will need to use a ANSI C compiler. This means under SunOS 4 you can't
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. # use cc, instead you will have to use gcc.
! MANDIR = /usr/man -# CC = gcc
+CC = gcc
# The directories to put things in. If you use multiple # This may help with some versions of make
# architectures or share the samba binaries across NFS then SHELL = /bin/sh
# you will probably want to change this layout. @@ -42,13 +42,13 @@
! BASEDIR = /usr # set these to where to find various files
! BINDIR = $(BASEDIR)/bin # These can be overridden by command line switches (see smbd(8))
! SBINDIR = $(BASEDIR)/sbin # or in smb.conf (see smb.conf(5))
! LIBDIR = /etc -SMBLOGFILE = $(VARDIR)/log.smb
! VARDIR = /var/log -NMBLOGFILE = $(VARDIR)/log.nmb
+SMBLOGFILE = $(VARDIR)/log/log.smb
+NMBLOGFILE = $(VARDIR)/log/log.nmb
CONFIGFILE = $(LIBDIR)/smb.conf
LMHOSTSFILE = $(LIBDIR)/lmhosts
# The permissions to give the executables # the directory where lock files go
INSTALLPERMS = 0755 -LOCKDIR = $(VARDIR)/locks
*************** +LOCKDIR = $(VARDIR)/lock/samba
*** 23,35 ****
# add -DSYSLOG for syslog support
# RPM_OPT_FLAGS is needed when building an RPM distribution package
# for RedHat Linux.
! # FLAGS1 = $(RPM_OPT_FLAGS)
! FLAGS1 = -O
LIBS1 =
# You will need to use a ANSI C compiler. This means under SunOS 4 you can't # set this to the default group you want your machine to appear in
# use cc, instead you will have to use gcc. # for browsing. This can also be set in nmbd (see nmbd(8))
! # CC = gcc @@ -71,8 +71,8 @@
# This may help with some versions of make # This is for PAM authentication. RedHat Linux uses PAM.
SHELL = /bin/sh # If you use PAM, then uncomment the following lines:
--- 23,35 ---- -# PAM_FLAGS = -DUSE_PAM
# add -DSYSLOG for syslog support -# PAM_LIBS = -ldl -lpam
# RPM_OPT_FLAGS is needed when building an RPM distribution package +PAM_FLAGS = -DUSE_PAM
# for RedHat Linux. +PAM_LIBS = -ldl -lpam
! FLAGS1 = $(RPM_OPT_FLAGS)
! # FLAGS1 = -O
LIBS1 =
# You will need to use a ANSI C compiler. This means under SunOS 4 you can't # This is for AFS authentication. If you use AFS then set AFS_BASE
# use cc, instead you will have to use gcc. # according to your system layout, and uncomment the other lines as well.
! CC = gcc @@ -181,8 +181,8 @@
# contributed by Andrew.Tridgell@anu.edu.au
# AXPROC defines DEC Alpha Processor
# FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
-# FLAGSM = -DLINUX -DFAST_SHARE_MODES
-# LIBSM =
+FLAGSM = -DLINUX -DFAST_SHARE_MODES
+LIBSM =
# This may help with some versions of make # Use this for Linux with shadow passwords and quota
SHELL = /bin/sh # contributed by xeno@mix.hive.no
***************
*** 48,54 ****
LMHOSTSFILE = $(LIBDIR)/lmhosts
# the directory where lock files go
! LOCKDIR = $(VARDIR)/locks
# set this to the default group you want your machine to appear in
# for browsing. This can also be set in nmbd (see nmbd(8))
--- 48,54 ----
LMHOSTSFILE = $(LIBDIR)/lmhosts
# the directory where lock files go
! LOCKDIR = /var/lock/samba
# set this to the default group you want your machine to appear in
# for browsing. This can also be set in nmbd (see nmbd(8))
***************
*** 71,78 ****
# This is for PAM authentication. RedHat Linux uses PAM.
# If you use PAM, then uncomment the following lines:
! # PAM_FLAGS = -DUSE_PAM
! # PAM_LIBS = -ldl -lpam
# This is for AFS authentication. If you use AFS then set AFS_BASE
# according to your system layout, and uncomment the other lines as well.
--- 71,78 ----
# This is for PAM authentication. RedHat Linux uses PAM.
# If you use PAM, then uncomment the following lines:
! PAM_FLAGS = -DUSE_PAM
! PAM_LIBS = -ldl -lpam
# This is for AFS authentication. If you use AFS then set AFS_BASE
# according to your system layout, and uncomment the other lines as well.
***************
*** 181,188 ****
# contributed by Andrew.Tridgell@anu.edu.au
# AXPROC defines DEC Alpha Processor
# FLAGSM = -DLINUX -DAXPROC
! # FLAGSM = -DLINUX
! # LIBSM =
# Use this for Linux with shadow passwords and quota
# contributed by xeno@mix.hive.no
--- 181,188 ----
# contributed by Andrew.Tridgell@anu.edu.au
# AXPROC defines DEC Alpha Processor
# FLAGSM = -DLINUX -DAXPROC
! FLAGSM = -DLINUX
! LIBSM =
# Use this for Linux with shadow passwords and quota
# contributed by xeno@mix.hive.no

View File

@ -1,15 +1,16 @@
Summary: SMB client and server Summary: SMB client and server
Name: samba Name: samba
Version: 1.9.17 %define version 1.9.17
Release: 1 Version: %{version}
Release: 2
Copyright: GPL Copyright: GPL
Group: Networking Group: Networking
Source: ftp://samba.anu.edu.au/pub/samba/samba-1.9.17.tar.gz Source: ftp://samba.anu.edu.au/pub/samba/samba-%{version}.tar.gz
Patch: samba-make.patch Patch: samba-make.patch
Patch2: samba-axp.patch Patch2: samba-axp.patch
Packager: John H Terpstra [Samba-Team] <jht@aquasoft.com.au> Packager: John H Terpstra [Samba-Team] <jht@aquasoft.com.au>
Requires: pamconfig Requires: pamconfig
BuildRoot: /tmp/samba-root BuildRoot: /tmp/samba
%description %description
Samba provides an SMB server which can be used to provide network Samba provides an SMB server which can be used to provide network