From 57772503376dbbc6229a76ec4fd82dafd30e222521c0e687381cbbd13bcf275f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 11 May 2010 15:16:16 +0000 Subject: [PATCH] Accepting request 39666 from Apache checked in (request 39666) OBS-URL: https://build.opensuse.org/request/show/39666 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=313 --- apache2.changes | 13 ------------- apache2.spec | 6 ------ 2 files changed, 19 deletions(-) diff --git a/apache2.changes b/apache2.changes index 6a525c9..25f8b36 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -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 0580bad..74e5169 100644 --- a/apache2.spec +++ b/apache2.spec @@ -67,8 +67,6 @@ 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} @@ -300,7 +298,6 @@ 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 @@ -398,9 +395,6 @@ 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 #