pool/apache2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 197199 from home:elvigia:branches:Apache

Browse Source 
- Ensure we only use /run and not /var/run

OBS-URL: https://build.opensuse.org/request/show/197199
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=390
This commit is contained in:
Cristian Rodríguez 2013-09-03 04:07:30 +00:00 committed by Git OBS Bridge
parent 4281e40e7d
commit 888fcaf9d4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 3 03:58:27 UTC 2013 - crrodriguez@opensuse.org
- Ensure we only use /run and not /var/run
-------------------------------------------------------------------
Fri Aug 30 04:48:07 UTC 2013 - crrodriguez@opensuse.org

6
apache2.spec
View File

@ -69,7 +69,11 @@ BuildRequires: expat-devel
%define localstatedir /var/lib/%{pname}
%define proxycachedir /var/cache/%{pname}
%define logfiledir /var/log/%{pname}
%if %suse_version > 1220
%define runtimedir /run
%else
%define runtimedir /var/run
%endif
%define sysconfdir /etc/%{pname}
%define includedir %{_includedir}/%{pname}
%define libexecdir %_libdir/%{pname}
@ -500,10 +504,10 @@ for mpm in %{mpms_to_build}; do
configure
sed "s/%{vers}-$mpm//" include/ap_config_auto.h > include/ap_config_auto.h.new
mv include/ap_config_auto.h.new include/ap_config_auto.h
sed -i -e "s@/var/run@%{runtimedir}@g" include/ap_config_layout.h
make CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -fPIC \
-Wall \
-DDEFAULT_PIDLOG='\"%{runtimedir}/%{httpd}.pid\"' \
-DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"' " \
%{?jobs:-j%jobs}