From af4b244dad00f225ee2083fb2f0a93c4532aa65c4e99b1259734175605c4231d Mon Sep 17 00:00:00 2001 From: Roman Drahtmueller Date: Fri, 7 May 2010 14:35:32 +0000 Subject: [PATCH] Accepting request 39650 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/apache2 via accept of submit request 39650 revision 3. Request was accepted with message: Cool, thanks. OBS-URL: https://build.opensuse.org/request/show/39650 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=312 --- apache2.changes | 6 ++++++ apache2.spec | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/apache2.changes b/apache2.changes index 0ec5298..6a525c9 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/apache2.spec b/apache2.spec index fc6da53..0580bad 100644 --- a/apache2.spec +++ b/apache2.spec @@ -67,6 +67,8 @@ Version: 2.2.15 Release: 1 #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} @@ -396,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 #