diff --git a/apache2.changes b/apache2.changes index 25f8b36..6a525c9 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri May 7 12:38:10 UTC 2010 - aj@suse.de + +- Do not compile in build time but use mtime of changes file instead. + This allows build-compare to identify that no changes have happened. + +------------------------------------------------------------------- +Tue Mar 30 23:49:28 UTC 2010 - poeml@cmdline.net + +- add apache2-prefork to the Requires of apache2-devel, because apxs2 will + build for prefork, if not called as apxs2-worker (which should rarely be the + case). Also added gcc to the Requires. + ------------------------------------------------------------------- Mon Mar 8 12:34:18 UTC 2010 - poeml@cmdline.net diff --git a/apache2.spec b/apache2.spec index 74e5169..4fab696 100644 --- a/apache2.spec +++ b/apache2.spec @@ -64,9 +64,11 @@ License: ASLv.. Group: Productivity/Networking/Web/Servers %define realver 2.2.15 Version: 2.2.15 -Release: 1 +Release: 2 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 +# Add file to take mtime from it in prep section +Source1: apache2.changes Source10: SUSE-NOTICE Source11: rc.%{pname} Source13: sysconfig.%{pname} @@ -298,6 +300,7 @@ Summary: Apache 2.0 Header and Include Files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %{pname}-MPM Requires: libapr1-devel libapr-util1-devel +Requires: apache2-prefork gcc %description devel This package contains header files and include files that are needed @@ -395,6 +398,9 @@ cp -p %{S:16} %{S:17} .; gunzip mkcert.sh.gz # sed 's,(" PLATFORM "),(%platform_string),' server/core.c > tmp_file && mv tmp_file server/core.c sed 's/public_html/%{userdir}/g' docs/conf/extra/httpd-userdir.conf.in > tmp_file && mv tmp_file docs/conf/extra/httpd-userdir.conf.in +# Use mtime of .changes for build time +CHANGES=`stat --format="%y" %SOURCE1` +sed -i -e "s/__DATE__ \" \" __TIME__;/\"$CHANGES\";/" server/buildmark.c # # now configure Apache #