diff options
| -rwxr-xr-x | build/get-version.sh | 2 | ||||
| -rw-r--r-- | build/rpm/httpd.spec.in | 5 | ||||
| -rwxr-xr-x | buildconf | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/build/get-version.sh b/build/get-version.sh index ddf175cebd..376a5c7303 100755 --- a/build/get-version.sh +++ b/build/get-version.sh @@ -48,6 +48,8 @@ elif test "$1" = "major"; then echo ${major} elif test "$1" = "mmn"; then echo ${mmn} +elif test "$1" = "epoch"; then + printf "%03d" ${major} ${minor} ${patch} elif test "$1" = "libtool"; then # Yes, ${minor}:${patch}:${minor} is correct due to libtool idiocy. echo ${minor}:${patch}:${minor} diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in index bd49d23402..6524a9beb3 100644 --- a/build/rpm/httpd.spec.in +++ b/build/rpm/httpd.spec.in @@ -7,13 +7,14 @@ Summary: Apache HTTP Server Name: httpd Version: APACHE_VERSION Release: APACHE_RELEASE +Epoch: APACHE_EPOCH00%{release} URL: http://httpd.apache.org/ Vendor: Apache Software Foundation Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 License: Apache License, Version 2.0 Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildPrereq: apr-devel, apr-util-devel, openldap-devel, db4-devel, expat-devel, findutils, perl, pkgconfig, zlib-devel, pcre-devel >= 5.0 +BuildPrereq: apr-devel, apr-util-devel, openldap-devel, db4-devel, expat-devel, findutils, perl, pkgconfig, zlib-devel, pcre-devel >= 5.0, distcache-devel >= 1.4 BuildPrereq: /usr/bin/apr-1-config, /usr/bin/apu-1-config Requires: apr >= 1.4.0, apr-util >= 1.4.0, pcre-devel >= 5.0, gawk, /usr/share/magic.mime, /usr/bin/find, openldap Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv @@ -32,7 +33,7 @@ Internet. Group: Development/Libraries Summary: Development tools for the Apache HTTP server. Obsoletes: secureweb-devel, apache-devel -Requires: libtool, httpd = %{version} +Requires: libtool, httpd = %{epoch}:%{version}-%{release} Requires: apr-devel >= 1.4.0, apr-util-devel >= 1.4.0 %description devel @@ -198,6 +198,7 @@ rm -rf autom4te*.cache if [ -f `which cut` ]; then echo rebuilding rpm spec file ( VMMN=`build/get-version.sh mmn include/ap_mmn.h MODULE_MAGIC_NUMBER` + EPOCH=`build/get-version.sh epoch include/ap_release.h AP_SERVER` REVISION=`build/get-version.sh all include/ap_release.h AP_SERVER` VERSION=`echo $REVISION | cut -d- -s -f1` RELEASE=`echo $REVISION | cut -d- -s -f2` @@ -209,6 +210,7 @@ if [ -f `which cut` ]; then sed -e "s/APACHE_VERSION/$VERSION/" \ -e "s/APACHE_RELEASE/$RELEASE/" \ -e "s/APACHE_MMN/$VMMN/" \ + -e "s/APACHE_EPOCH/$EPOCH/" \ > httpd.spec ) fi |