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

Accepting request 548029 from Apache

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/548029
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=139
This commit is contained in:
Dominique Leuenberger 2017-12-08 20:46:26 +00:00 committed by Git OBS Bridge
commit 644bfd7de2
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apache2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Nov 26 17:25:10 UTC 2017 - sergiolindo.empresa@gmail.com
- Add which and w3m as dependencies. poo#28406
-------------------------------------------------------------------
Thu Nov 23 13:43:30 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Mon Nov 20 08:43:45 UTC 2017 - pgajdos@suse.com

15
apache2.spec
View File

@ -16,6 +16,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define apache_mmn %(test -s %{SOURCE0} && { echo -n apache_mmn_; bzcat %{SOURCE0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; })
%define suse_maintenance_mmn 0
%define default_mpm prefork
@ -148,6 +153,8 @@ BuildRequires: zlib-devel
Requires: %{_sysconfdir}/mime.types
Requires: %{name}-MPM
Requires: logrotate
Requires: w3m
Requires: which
%if 0%{?suse_version} < 1210
Requires(post): %insserv_prereq
%endif
@ -517,7 +524,7 @@ cp -p %{buildroot}/%{sysconfdir}/httpd.conf ./httpd.conf.default
rm %{buildroot}/%{sysconfdir}/httpd-*.conf
#
# create directories
mkdir -p %{buildroot}/%{_var}/adm/fillup-templates \
mkdir -p %{buildroot}/%{_fillupdir} \
%{buildroot}/%{proxycachedir} \
%{buildroot}/%{localstatedir}
#
@ -574,7 +581,7 @@ mkdir -p %{buildroot}/%{sysconfdir}/vhosts.d
#
# install sysconfig template
install -m 644 $RPM_SOURCE_DIR/sysconfig.%{name} \
%{buildroot}/%{_var}/adm/fillup-templates/sysconfig.%{name}
%{buildroot}/%{_fillupdir}/sysconfig.%{name}
#
# install configuration files:
mkdir -p %{buildroot}/%{runtimedir}
@ -609,7 +616,7 @@ EOF
%if "%{_lib}" != "lib64"
sed -e 's/lib64/%{_lib}/' -i \
%{buildroot}/%{sysconfdir}/loadmodule.conf \
%{buildroot}/%{_var}/adm/fillup-templates/sysconfig.%{name}
%{buildroot}/%{_fillupdir}/sysconfig.%{name}
%endif
# remove configuration for mpms which have not been built
@ -836,7 +843,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_sbindir}/suexec2
%{iconsdir}
%{errordir}
%{_var}/adm/fillup-templates/sysconfig.%{name}
%{_fillupdir}/sysconfig.%{name}
%attr(755,root,root) %{_libdir}/%{name}_MMN
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/mod_*.so