Changes - j0ke.net Open Build Service

Changes of Revision 22

[-] [+]	Changed	httpd.spec
@@ -4,13 +4,12 @@ %define mmn 20120211 %define mmnisa %{mmn}-%{__isa_name}-%{__isa_bits} %define vstring CentOS -%define real_name httpd Provides: httpd Provides: Webserver Summary: Apache HTTP Server -Name: httpd24 +Name: httpd Version: 2.4.6 Release: 99IX URL: http://httpd.apache.org/ @@ -52,7 +51,7 @@ Patch26: httpd-2.4.1-suenable.patch License: ASL 2.0 Group: System Environment/Daemons -BuildRoot: %{_tmppath}/%{real_name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto, lynx BuildRequires: zlib-devel, libselinux-devel, lua-devel BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0 @@ -141,8 +140,8 @@ The mod_ldap and mod_authnz_ldap modules add support for LDAP authentication to the Apache HTTP Server. -%prep -n %{real_name} -%setup -q -n %{real_name} +%prep -n %{name} +%setup -q -n %{name} %patch1 -p1 -b .apctl %patch2 -p1 -b .apxs %patch3 -p1 -b .deplibs @@ -381,21 +380,21 @@ # Register the httpd service if [ $1 -eq 1 ] ; then # Initial installation - chkconfig ${real_name} on >/dev/null 2>&1 \|\| : + chkconfig ${name} on >/dev/null 2>&1 \|\| : fi %preun if [ $1 -eq 0 ] ; then # Package removal, not upgrade - chkconfig ${real_name} > /dev/null 2>&1 \|\| : + chkconfig ${name} > /dev/null 2>&1 \|\| : fi %postun -service ${real_name} restart 2>&1 \|\| : +service ${name} restart 2>&1 \|\| : /sbin/chkconfig --del httpd >/dev/null 2>&1 \|\| : %posttrans -service ${real_name} restart 2>&1 \|\| : +service ${name} restart 2>&1 \|\| : %define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt %define sslkey %{_sysconfdir}/pki/tls/private/localhost.key