rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

drop ambiguous invalid "-" in RHS of httpd-mmn Provide, keeping old Provide

Browse Source 
for transition
This commit is contained in:
Joe Orton 2013-11-12 09:54:01 +00:00
parent 13efaf1ac9
commit b39251e583
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
httpd.spec
View File

@ -2,7 +2,8 @@
%define docroot /var/www %define docroot /var/www
%define suexec_caller apache %define suexec_caller apache
%define mmn 20120211 %define mmn 20120211
%define mmnisa %{mmn}-%{__isa_name}-%{__isa_bits} %define oldmmnisa %{mmn}-%{__isa_name}-%{__isa_bits}
%define mmnisa %{mmn}-%{__isa_name}%{__isa_bits}
%define vstring Fedora %define vstring Fedora
# Drop automatic provides for module DSOs # Drop automatic provides for module DSOs
@ -14,7 +15,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.6 Version: 2.4.6
Release: 7%{?dist} Release: 8%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -80,7 +81,7 @@ Requires: /etc/mime.types, fedora-logos-httpd
Obsoletes: httpd-suexec Obsoletes: httpd-suexec
Provides: webserver Provides: webserver
Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa}
Requires: httpd-tools = %{version}-%{release} Requires: httpd-tools = %{version}-%{release}
Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/useradd
Requires(preun): systemd-units Requires(preun): systemd-units
@ -623,6 +624,10 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd %{_sysconfdir}/rpm/macros.httpd
%changelog %changelog
* Tue Nov 12 2013 Joe Orton <jorton@redhat.com> - 2.4.6-8
- drop ambiguous invalid "-" in RHS of httpd-mmn Provide, keeping old Provide
for transition
* Fri Nov 1 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-7 * Fri Nov 1 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-7
- systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg - systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg