svn commit: samba r11152 - branches/SAMBA_3_0/packaging/RedHat
branches/SAMBA_3_0/source/script
branches/SAMBA_3_0_RELEASE/packaging/RedHat
branches/SAMBA_3_0_RELEASE/source/script
trunk/packaging/RedHat trunk/source/script
jerry at samba.org
jerry at samba.org
Tue Oct 18 17:20:51 GMT 2005
Author: jerry
Date: 2005-10-18 17:20:50 +0000 (Tue, 18 Oct 2005)
New Revision: 11152
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11152
Log:
fix some regressions caused by the trunk->3.0 merge when install docs with SWAT
Modified:
branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl
branches/SAMBA_3_0/source/script/installswat.sh
branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl
branches/SAMBA_3_0_RELEASE/source/script/installswat.sh
trunk/packaging/RedHat/samba.spec.tmpl
trunk/source/script/installswat.sh
Changeset:
Modified: branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl 2005-10-18 16:06:44 UTC (rev 11151)
+++ branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl 2005-10-18 17:20:50 UTC (rev 11152)
@@ -114,7 +114,7 @@
mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba}
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{help,include,using_samba}
mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs}
mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO
mkdir -p $RPM_BUILD_ROOT/var/lib/samba
@@ -445,10 +445,8 @@
%{prefix}/lib/libsmbclient.a
%{prefix}/lib/libsmbclient.so
%{prefix}/share/swat/help/*
-%{prefix}/share/swat/images/*
%{prefix}/share/swat/include/*.html
%{prefix}/share/swat/lang/*/help/*
-%{prefix}/share/swat/lang/*/images/*
%{prefix}/share/swat/using_samba/*
%config(noreplace) /etc/samba/lmhosts
%config(noreplace) /etc/samba/smb.conf
Modified: branches/SAMBA_3_0/source/script/installswat.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installswat.sh 2005-10-18 16:06:44 UTC (rev 11151)
+++ branches/SAMBA_3_0/source/script/installswat.sh 2005-10-18 17:20:50 UTC (rev 11152)
@@ -87,7 +87,7 @@
if [ -d $SRCDIR../docs/htmldocs/ ]; then
- for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide
+ for dir in htmldocs/manpages htmldocs/Samba3-ByExample htmldocs/Samba3-Developers-Guide htmldocs/Samba3-HOWTO
do
if [ ! -d $SRCDIR../docs/$dir ]; then
Modified: branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl
===================================================================
--- branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl 2005-10-18 16:06:44 UTC (rev 11151)
+++ branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl 2005-10-18 17:20:50 UTC (rev 11152)
@@ -114,7 +114,7 @@
mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba}
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{help,include,using_samba}
mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs}
mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO
mkdir -p $RPM_BUILD_ROOT/var/lib/samba
@@ -445,10 +445,8 @@
%{prefix}/lib/libsmbclient.a
%{prefix}/lib/libsmbclient.so
%{prefix}/share/swat/help/*
-%{prefix}/share/swat/images/*
%{prefix}/share/swat/include/*.html
%{prefix}/share/swat/lang/*/help/*
-%{prefix}/share/swat/lang/*/images/*
%{prefix}/share/swat/using_samba/*
%config(noreplace) /etc/samba/lmhosts
%config(noreplace) /etc/samba/smb.conf
Modified: branches/SAMBA_3_0_RELEASE/source/script/installswat.sh
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/script/installswat.sh 2005-10-18 16:06:44 UTC (rev 11151)
+++ branches/SAMBA_3_0_RELEASE/source/script/installswat.sh 2005-10-18 17:20:50 UTC (rev 11152)
@@ -87,7 +87,7 @@
if [ -d $SRCDIR../docs/htmldocs/ ]; then
- for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide
+ for dir in htmldocs/manpages htmldocs/Samba3-ByExample htmldocs/Samba3-Developers-Guide htmldocs/Samba3-HOWTO
do
if [ ! -d $SRCDIR../docs/$dir ]; then
Modified: trunk/packaging/RedHat/samba.spec.tmpl
===================================================================
--- trunk/packaging/RedHat/samba.spec.tmpl 2005-10-18 16:06:44 UTC (rev 11151)
+++ trunk/packaging/RedHat/samba.spec.tmpl 2005-10-18 17:20:50 UTC (rev 11152)
@@ -114,7 +114,7 @@
mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba}
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{help,include,using_samba}
mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs}
mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO
mkdir -p $RPM_BUILD_ROOT/var/lib/samba
@@ -445,10 +445,8 @@
%{prefix}/lib/libsmbclient.a
%{prefix}/lib/libsmbclient.so
%{prefix}/share/swat/help/*
-%{prefix}/share/swat/images/*
%{prefix}/share/swat/include/*.html
%{prefix}/share/swat/lang/*/help/*
-%{prefix}/share/swat/lang/*/images/*
%{prefix}/share/swat/using_samba/*
%config(noreplace) /etc/samba/lmhosts
%config(noreplace) /etc/samba/smb.conf
Modified: trunk/source/script/installswat.sh
===================================================================
--- trunk/source/script/installswat.sh 2005-10-18 16:06:44 UTC (rev 11151)
+++ trunk/source/script/installswat.sh 2005-10-18 17:20:50 UTC (rev 11152)
@@ -87,7 +87,7 @@
if [ -d $SRCDIR../docs/htmldocs/ ]; then
- for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide
+ for dir in htmldocs/manpages htmldocs/Samba3-ByExample htmldocs/Samba3-Developers-Guide htmldocs/Samba3-HOWTO
do
if [ ! -d $SRCDIR../docs/$dir ]; then
More information about the samba-cvs
mailing list