summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-04-16 18:19:58 +0000
committerJeremy Allison <jra@samba.org>2001-04-16 18:19:58 +0000
commitb0facfe5b718369bdd43da54d5df0f3824daa7c0 (patch)
tree644a56d3aeef3140dccaae991155e00fc054c05b
parent4c59a56ac922a218403bb74c1ee172bb3b627f8f (diff)
downloadsamba-b0facfe5b718369bdd43da54d5df0f3824daa7c0.tar.gz
samba-b0facfe5b718369bdd43da54d5df0f3824daa7c0.tar.xz
samba-b0facfe5b718369bdd43da54d5df0f3824daa7c0.zip
Migrate existing files to LHS standards.
Jermey.
-rw-r--r--packaging/RedHat/samba2.spec.tmpl33
1 files changed, 26 insertions, 7 deletions
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index d127f0aab52..f8f6e66687a 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -150,7 +150,7 @@ NUMCPU=`grep processor /proc/cpuinfo | wc -l`
CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
--prefix=%{prefix} \
--localstatedir=/var \
- --with-configdir=/etc \
+ --with-configdir=/etc/samba \
--with-codepagedir=/etc/codepages \
--with-fhs \
--with-quotas \
@@ -170,6 +170,7 @@ make -j${NUMCPU} bin/smbspool
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/sbin
+mkdir -p $RPM_BUILD_ROOT/etc/samba
mkdir -p $RPM_BUILD_ROOT/etc/codepages/src
mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba}
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -207,7 +208,7 @@ ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
# This allows us to get away without duplicating code that
# sombody else can maintain for us.
cd source
-make LIBDIR=$RPM_BUILD_ROOT%{prefix}/etc \
+make LIBDIR=$RPM_BUILD_ROOT%{prefix}/etc/samba \
BINDIR=$RPM_BUILD_ROOT%{prefix}/bin \
MANDIR=$RPM_BUILD_ROOTMANDIR_MACRO \
CODEPAGEDIR=$RPM_BUILD_ROOT%{prefix}/etc/codepages \
@@ -237,14 +238,32 @@ done
# Install the miscellany
install -m644 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat
-install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT/etc/smb.conf
-install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/smbusers
install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
install -m755 packaging/RedHat/findsmb $RPM_BUILD_ROOT%{prefix}/bin
install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba
install -m644 packaging/RedHat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
-echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/samba/lmhosts
+if [ -f /etc/smb.conf ]; then
+ mv /etc/smb.conf /etc/samba/smb.conf
+else
+ install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT/etc/samba/smb.conf
+fi
+
+if [ -f /etc/smbusers ]; then
+ mv /etc/smbusers /etc/samba/smbusers
+else
+ install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
+fi
+
+if [ -f /etc/lmhosts ]; then
+ mv /etc/lmhosts /etc/samba/lmhosts
+else
+ echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/samba/lmhosts
+fi
+
+if [ -f /etc/MACHINE.SID ]; then
+ mv /etc/MACHINE.SID /etc/samba/MACHINE.SID
+fi
%clean
rm -rf $RPM_BUILD_ROOT
@@ -272,9 +291,9 @@ fi
# Install the correct version of the samba pam file, depending on pam version.
if [ -f /lib/security/pam_stack.so ]; then
- install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
-else
install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
+else
+ install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
fi
%preun