summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-06-06 21:14:03 +0000
committerGerald Carter <jerry@samba.org>2003-06-06 21:14:03 +0000
commita185c1c233825107acf959ebca9ec3763b39e71b (patch)
tree9886dbb50695ce6c77a3b50d03bbbed89bc0b323 /packaging
parent856242eb746182f5971e3eb7fbfa9190d88a511f (diff)
downloadsamba-a185c1c233825107acf959ebca9ec3763b39e71b.tar.gz
more syncs from SAMBA_3_0
Diffstat (limited to 'packaging')
-rw-r--r--packaging/Debian/README1
-rw-r--r--packaging/RedHat/makerpms.sh.tmpl11
2 files changed, 6 insertions, 6 deletions
diff --git a/packaging/Debian/README b/packaging/Debian/README
index 7de9ba625c5..4404963c608 100644
--- a/packaging/Debian/README
+++ b/packaging/Debian/README
@@ -63,5 +63,4 @@ better things to do and know nothing about the Debian packaging system.
Eloy A. Paris <peloy@debian.org>
Steve Langasek <vorlon@debian.org>
-$Id: README,v 1.3 2003/06/01 07:12:51 peloy Exp $
diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl
index 5daf508de8b..dc82033b06a 100644
--- a/packaging/RedHat/makerpms.sh.tmpl
+++ b/packaging/RedHat/makerpms.sh.tmpl
@@ -43,13 +43,14 @@ case $RPMVER in
echo Building for RPM v3.x
sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba.spec > $SPECFILE
;;
- 4.1*)
- echo Building for RPM v4.1
- RPM="rpmbuild"
+ 4.0*)
+ ## catch rpm v4.0.x first
+ echo Building for RPM v4.0
sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba.spec > $SPECFILE
;;
- 4*)
- echo Building for RPM v4.x
+ 4.*)
+ echo Building for RPM v4.1 or later
+ RPM="rpmbuild"
sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba.spec > $SPECFILE
;;
*)