diff options
| -rw-r--r-- | packaging/Caldera/OpenLinux/makerpms.sh.tmpl | 24 | ||||
| -rw-r--r-- | packaging/Caldera/OpenLinux/samba3.spec.tmpl | 2 |
2 files changed, 19 insertions, 7 deletions
diff --git a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl index e7ba1d9623..54e207bd8d 100644 --- a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl +++ b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl @@ -17,6 +17,10 @@ if [ z$1 = z"old" ]; then old=1; shift fi +if [ z$1 = z"team" ]; then + team=1; + shift +fi # Start preparing the packages... if [ $devel -ne 0 ]; then @@ -28,15 +32,23 @@ else fi cp -af *.spec *.spec-lsb $SPECDIR -for src in *.patch; do - trg=`echo $src | sed 's;xxxxxx;PVERSION;'` - cp -a $src $SRCDIR/$trg +if [ $team -ne 0 ]; then + cp *.spec-team $SPECDIR +fi +for i in `ls *.patch` +do + cp $i $SRCDIR/ done - # Start building the package cd $SPECDIR if [ $old -eq 0 ]; then mv -f samba2.spec samba2.spec-nonlsb -ln -f samba2.spec-lsb samba2.spec +ln -f samba2.spec-lsb samba3.spec +fi +if [ $team -ne 0 ]; then + mv -f samba3.spec samba3.spec-lsb + ln -f samba3.spec-team samba3.spec + rpm -ba -v samba3.spec +else + rpm -ba -v --rmsource --clean samba3.spec fi -rpm -ba -v samba2.spec diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl index ab4e48649b..e32dd89d28 100644 --- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl +++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl @@ -21,7 +21,7 @@ Requires : libpam >= 0.66, SysVinit-scripts >= 1.04-6 BuildRoot : /tmp/%{Name}-%{Version} -Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}%{date}.tar.gz +Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz #Patch0: %{Name}-%{Version}-smbmount.patch Patch1: %{Name}-%{Version}-install.patch #Patch2: %{Name}-%{Version}-smbconf.patch |