SHA256
1
0
forked from pool/apache2

Accepting request 305442 from home:kstreitova:branches:Apache

- simplify apache2.logrotate, use sharedscripts [bnc#713581]

- remove curly brackets around format sequence "%y" in 
  `stat --format="%{y}" %{SOURCE1}` that caused an incorrect
  evaluation. Add escaping to proper spec-cleaner processing in
  the future

OBS-URL: https://build.opensuse.org/request/show/305442
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=443
This commit is contained in:
2015-05-05 14:04:17 +00:00
committed by Git OBS Bridge
parent 70524cd248
commit c1c669e98d
3 changed files with 22 additions and 47 deletions

View File

@@ -324,7 +324,7 @@ cp %{SOURCE24} ./${c##%{name}-}
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}`
CHANGES=`stat --format="%%y" %{SOURCE1}`
sed -i -e "s/__DATE__ \" \" __TIME__;/\"$CHANGES\";/" server/buildmark.c
#
# now configure Apache