You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2009/09/25 23:02:33 UTC

svn commit: r819008 - in /httpd/httpd/trunk: build/get-version.sh build/rpm/httpd.spec.in buildconf

Author: minfrin
Date: Fri Sep 25 21:02:33 2009
New Revision: 819008

URL: http://svn.apache.org/viewvc?rev=819008&view=rev
Log:
Add support for an "epoch" in the RPM spec file. This epoch is a discrete
number used to determine if one RPM is newer than another, which in turn
ensures that v1.2.10 is always interpreted as newer than v1.2.9.

Modified:
    httpd/httpd/trunk/build/get-version.sh
    httpd/httpd/trunk/build/rpm/httpd.spec.in
    httpd/httpd/trunk/buildconf

Modified: httpd/httpd/trunk/build/get-version.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/get-version.sh?rev=819008&r1=819007&r2=819008&view=diff
==============================================================================
--- httpd/httpd/trunk/build/get-version.sh (original)
+++ httpd/httpd/trunk/build/get-version.sh Fri Sep 25 21:02:33 2009
@@ -48,6 +48,8 @@
   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}

Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=819008&r1=819007&r2=819008&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/trunk/build/rpm/httpd.spec.in Fri Sep 25 21:02:33 2009
@@ -7,13 +7,14 @@
 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 @@
 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

Modified: httpd/httpd/trunk/buildconf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/buildconf?rev=819008&r1=819007&r2=819008&view=diff
==============================================================================
--- httpd/httpd/trunk/buildconf (original)
+++ httpd/httpd/trunk/buildconf Fri Sep 25 21:02:33 2009
@@ -198,6 +198,7 @@
 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 @@
     sed -e "s/APACHE_VERSION/$VERSION/" \
         -e "s/APACHE_RELEASE/$RELEASE/" \
         -e "s/APACHE_MMN/$VMMN/" \
+        -e "s/APACHE_EPOCH/$EPOCH/" \
     > httpd.spec )
 fi
 



Re: svn commit: r819008 - in /httpd/httpd/trunk: build/get-version.sh build/rpm/httpd.spec.in buildconf

Posted by Graham Leggett <mi...@sharp.fm>.
Ruediger Pluem wrote:

>>  Version: APACHE_VERSION
>>  Release: APACHE_RELEASE
>> +Epoch: APACHE_EPOCH00%{release}
> 
> Why APACHE_EPOCH00%{release} and not just APACHE_EPOCH?

Someone wanting to roll their own spec file will most probably want to
set their own value for release, this makes that possible.

>>  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
> 
> Was this change intended?

Yes, though I left it out the commit message by accident. The SRPM won't
build without distcache-devel present.

Regards,
Graham
--

Re: svn commit: r819008 - in /httpd/httpd/trunk: build/get-version.sh build/rpm/httpd.spec.in buildconf

Posted by Ruediger Pluem <rp...@apache.org>.

On 09/25/2009 11:02 PM, minfrin@apache.org wrote:
> Author: minfrin
> Date: Fri Sep 25 21:02:33 2009
> New Revision: 819008
> 
> URL: http://svn.apache.org/viewvc?rev=819008&view=rev
> Log:
> Add support for an "epoch" in the RPM spec file. This epoch is a discrete
> number used to determine if one RPM is newer than another, which in turn
> ensures that v1.2.10 is always interpreted as newer than v1.2.9.
> 
> Modified:
>     httpd/httpd/trunk/build/get-version.sh
>     httpd/httpd/trunk/build/rpm/httpd.spec.in
>     httpd/httpd/trunk/buildconf
> 

> Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=819008&r1=819007&r2=819008&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/build/rpm/httpd.spec.in (original)
> +++ httpd/httpd/trunk/build/rpm/httpd.spec.in Fri Sep 25 21:02:33 2009
> @@ -7,13 +7,14 @@
>  Name: httpd
>  Version: APACHE_VERSION
>  Release: APACHE_RELEASE
> +Epoch: APACHE_EPOCH00%{release}

Why APACHE_EPOCH00%{release} and not just APACHE_EPOCH?

>  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

Was this change intended?

>  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

Regards

RĂ¼diger