summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-04-30 19:07:40 +0200
committerRemi Collet <fedora@famillecollet.com>2012-04-30 19:07:40 +0200
commitd5bbe8b882e6a0c7d1154cf784fda0e479b865f8 (patch)
tree4f5a883c504ccf7db27c62585fecda73c24a2992
parentad2289539025930128771f245b896a5ab6a20ea8 (diff)
httpd: sync with rawhide
-rw-r--r--httpd.logrotate2
-rw-r--r--httpd.spec8
2 files changed, 8 insertions, 2 deletions
diff --git a/httpd.logrotate b/httpd.logrotate
index 794b9d7..28c9730 100644
--- a/httpd.logrotate
+++ b/httpd.logrotate
@@ -4,6 +4,6 @@
sharedscripts
delaycompress
postrotate
- /sbin/service httpd reload > /dev/null 2>/dev/null || true
+ /bin/systemctl reload httpd.service > /dev/null 2>/dev/null || true
endscript
}
diff --git a/httpd.spec b/httpd.spec
index dff64b1..a041c8d 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -562,6 +562,12 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Mon Apr 30 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.2-5
+- sync with rawhide, rebuild for remi repo
+
+* Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-5
+- use systemctl from logrotate (#221073)
+
* Fri Apr 27 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.2-4
- sync with rawhide, rebuild for remi repo