Accepting request 34123 from Apache
Copy from Apache/apache2 based on submit request 34123 from user coolo OBS-URL: https://build.opensuse.org/request/show/34123 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=37
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
ef59fd240e
commit
0245419526
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 5 09:29:10 UTC 2010 - coolo@novell.com
|
||||
|
||||
- readd whitespace removed by autobuild
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 16 10:56:35 CET 2009 - jengelh@medozas.de
|
||||
|
||||
|
||||
46
apache2.spec
46
apache2.spec
@ -60,11 +60,11 @@ BuildRequires: expat-devel
|
||||
# "Server:" header
|
||||
%define VENDOR SUSE
|
||||
%define platform_string Linux/%VENDOR
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
%define realver 2.2.14
|
||||
Version: 2.2.14
|
||||
Release: 1
|
||||
Release: 2
|
||||
#Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2
|
||||
Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
|
||||
Source10: SUSE-NOTICE
|
||||
@ -181,7 +181,7 @@ Authors:
|
||||
%if %worker
|
||||
|
||||
%package worker
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Apache 2 worker MPM (Multi-Processing Module)
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Provides: %{pname}-MPM
|
||||
@ -190,7 +190,7 @@ Requires: %{name} = %{version}
|
||||
%if %prefork
|
||||
|
||||
%package prefork
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Apache 2 "prefork" MPM (Multi-Processing Module)
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Provides: %{pname}-MPM
|
||||
@ -202,7 +202,7 @@ Requires: %{name} = %{version}
|
||||
%if %event
|
||||
|
||||
%package event
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Apache 2 event MPM (Multi-Processing Module)
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Provides: %{pname}-MPM
|
||||
@ -211,7 +211,7 @@ Requires: %{name} = %{version}
|
||||
%if %itk
|
||||
|
||||
%package itk
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Apache 2 "ITK" MPM (Multi-Processing Module)
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Provides: %{pname}-MPM
|
||||
@ -294,7 +294,7 @@ Authors:
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Apache 2.0 Header and Include Files
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version} %{pname}-MPM
|
||||
@ -307,7 +307,7 @@ for development using the Apache API.
|
||||
|
||||
|
||||
%package doc
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Additional Package Documentation.
|
||||
Group: Documentation/Other
|
||||
%if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9
|
||||
@ -325,7 +325,7 @@ this package's base documentation.
|
||||
|
||||
|
||||
%package example-pages
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Example Pages for the Apache 2 Web Server
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
%if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9
|
||||
@ -344,7 +344,7 @@ Authors:
|
||||
Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
|
||||
|
||||
%package example-certificates
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Example certificates for the Apache 2 Web Server
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
|
||||
@ -358,7 +358,7 @@ Authors:
|
||||
Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
|
||||
|
||||
%package utils
|
||||
License: Apache Software License ..
|
||||
License: ASLv..
|
||||
Summary: Apache 2 utilities
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
|
||||
@ -483,6 +483,7 @@ function configure {
|
||||
--with-suexec-gidmin=96 \
|
||||
--with-suexec-safepath=%{suexec_safepath}
|
||||
}
|
||||
|
||||
#
|
||||
# |_ o| _| | _ _ ._
|
||||
# |_)|_|||(_| |(_)(_)|_)
|
||||
@ -499,13 +500,16 @@ 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
|
||||
|
||||
make CFLAGS="$RPM_OPT_FLAGS -fPIC \
|
||||
-fno-strict-aliasing \
|
||||
-Wall \
|
||||
-DDEFAULT_PIDLOG='\"%{runtimedir}/%{httpd}.pid\"' \
|
||||
-DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"' " \
|
||||
%{?jobs:-j%jobs}
|
||||
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
|
||||
#rm -rf $RPM_BUILD_ROOT.$mpm.pre
|
||||
#cp -a $RPM_BUILD_ROOT/ $RPM_BUILD_ROOT.$mpm.pre
|
||||
# show pathnames in config files
|
||||
@ -530,12 +534,14 @@ for mpm in %{mpms_to_build}; do
|
||||
#cp -a $RPM_BUILD_ROOT/ $RPM_BUILD_ROOT.$mpm.post
|
||||
done
|
||||
mkdir -p $RPM_BUILD_ROOT/%{libexecdir}
|
||||
|
||||
# remove references to mpm type in config_vars
|
||||
sed -e "s^/usr/%_lib/%{pname}-%{default_mpm}^/usr/%_lib/%{pname}^" \
|
||||
-e "s/httpd$/%{httpd}-%{default_mpm}/" \
|
||||
-e "s/%{pname}-%{default_mpm}/%{pname}/" \
|
||||
< $RPM_BUILD_ROOT/%{installbuilddir}/config_vars.mk-%{default_mpm} \
|
||||
> $RPM_BUILD_ROOT/%{installbuilddir}/config_vars.mk
|
||||
|
||||
# get rid of modules that do not differ between the MPMs (since most of them are the same)
|
||||
# by putting them in /usr/lib/apache%{vers}
|
||||
ldir=$RPM_BUILD_ROOT/%{libexecdir}
|
||||
@ -560,6 +566,7 @@ for i in $(cd $ldir-%{default_mpm}; ls -1 *.so); do
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
# merge the three /usr/include/apache2-* directories
|
||||
# by putting them in /usr/lib/apache%{vers}
|
||||
idir=$RPM_BUILD_ROOT/%{includedir}
|
||||
@ -596,6 +603,7 @@ cat > $RPM_BUILD_ROOT/%{_libdir}/%{pname}_MMN <<-EOF
|
||||
#!/bin/sh
|
||||
echo %{apache_mmn}
|
||||
EOF
|
||||
|
||||
cp -p $RPM_BUILD_ROOT/%{sysconfdir}/%{httpd}-%{default_mpm}.conf $RPM_BUILD_ROOT/%{sysconfdir}/httpd.conf
|
||||
cp -p $RPM_BUILD_ROOT/%{sysconfdir}/httpd.conf ./httpd.conf.default
|
||||
rm $RPM_BUILD_ROOT/%{sysconfdir}/%{httpd}-*.conf
|
||||
@ -687,6 +695,7 @@ cat > $RPM_BUILD_ROOT/%{sysconfdir}/uid.conf <<-EOF
|
||||
User %httpduser
|
||||
Group %httpdgroup
|
||||
EOF
|
||||
|
||||
# remove configuration for mpms which have not been built
|
||||
mpm_confs="$(awk '/IfModule .*\.c/ {print $2}' $RPM_BUILD_ROOT/%{sysconfdir}/server-tuning.conf | cut -d. -f1 | tr '\n' ' ')"
|
||||
for mpm_conf in $mpm_confs; do
|
||||
@ -703,16 +712,19 @@ install -m 644 $RPM_SOURCE_DIR/apache2-vhost-ssl.template $RPM_BUILD_ROOT/%{sysc
|
||||
install -m 644 $RPM_SOURCE_DIR/apache2-manual.conf $RPM_BUILD_ROOT/%{sysconfdir}/conf.d/
|
||||
# for mod_auth_ldap
|
||||
install -m 644 docs/conf/charset.conv $RPM_BUILD_ROOT/%{sysconfdir}/
|
||||
|
||||
cp -p $RPM_SOURCE_DIR/robots.txt .
|
||||
cp -p $RPM_SOURCE_DIR/favicon.ico $RPM_BUILD_ROOT/%{htdocsdir}/
|
||||
cat > $RPM_BUILD_ROOT/%{htdocsdir}/robots.txt <<-EOF
|
||||
User-Agent: *
|
||||
Disallow: /
|
||||
EOF
|
||||
|
||||
#
|
||||
# use official mime.types (more complete)
|
||||
#
|
||||
ln -sf ../mime.types $RPM_BUILD_ROOT/%{sysconfdir}/mime.types
|
||||
|
||||
mv $RPM_BUILD_ROOT/%{cgidir}/printenv .
|
||||
mv $RPM_BUILD_ROOT/%{cgidir}/test-cgi .
|
||||
pushd $RPM_BUILD_ROOT/%{_mandir}
|
||||
@ -754,10 +766,12 @@ pushd $RPM_BUILD_ROOT/%{_sbindir}
|
||||
EOT_ED
|
||||
mv apxs apxs%{vers}
|
||||
popd
|
||||
|
||||
# install firewall information file
|
||||
install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
|
||||
install -m 644 %{S:49} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
|
||||
install -m 644 %{S:50} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
|
||||
|
||||
#
|
||||
# filelists
|
||||
#
|
||||
@ -775,11 +789,13 @@ find $RPM_BUILD_ROOT/%{includedir}/.. -type f -o -type l \
|
||||
find $RPM_BUILD_ROOT/%{installbuilddir} -type f \
|
||||
| sed "s#$RPM_BUILD_ROOT##" \
|
||||
>> filelist-devel
|
||||
|
||||
# remove files from the build root that we won't package
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{pname}-*/*.exp # needed only on AIX
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{pname}/*.exp # needed only on AIX
|
||||
rm -f $RPM_BUILD_ROOT/%{_sbindir}/checkgid # needed only for user installations from tarball
|
||||
rm -r $RPM_BUILD_ROOT/%{sysconfdir}/extra # it is already in the documentation directory
|
||||
|
||||
#
|
||||
# O/ _|_ _ __|_
|
||||
# /O |_(/__> |_
|
||||
@ -821,6 +837,7 @@ done
|
||||
# auth_ldap_module needs to be loaded after ldap_module
|
||||
echo -e "/authnz_ldap\n+\n-m/ldap\nwq" | ed -s ./%{sysconfdir}/sysconfig.d/loadmodule.conf.test
|
||||
popd
|
||||
|
||||
%if %{?suse_version:1}%{!?suse_version:0}
|
||||
LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir} \
|
||||
$RPM_BUILD_ROOT/%{_sbindir}/httpd%{vers}-%{default_mpm} \
|
||||
@ -1016,11 +1033,13 @@ exit 0
|
||||
/usr/share/%{pname}/get_module_list &>/dev/null
|
||||
exit 0
|
||||
%endif
|
||||
|
||||
#
|
||||
# O/ ._ .__ / ._ _ __|_
|
||||
# /O |_)|(/_ / |_)(_)_> |_
|
||||
# | |
|
||||
#
|
||||
|
||||
# on Fedora, add the "apache" user
|
||||
%if %{?suse_version:0}%{!?suse_version:1}
|
||||
|
||||
@ -1077,19 +1096,24 @@ if [ ${FIRST_ARG:-0} -gt 1 ]; then
|
||||
sed "
|
||||
# generated files were renamed from suse_* to sysconfig.d/*
|
||||
s|\(^Include /etc/apache2\)/suse_\(\(include\|loadmodule\|global\).conf\)|\1/sysconfig.d/\2|
|
||||
|
||||
# the access_log configuration is now configurable
|
||||
s|^CustomLog /var/log/apache2/access_log.*|# &|
|
||||
|
||||
# group of wwwrun has changed
|
||||
s|^Group nogroup|Group www|
|
||||
|
||||
" < ./%{sysconfdir}/httpd.conf > $tmpfile
|
||||
chmod --reference=./%{sysconfdir}/httpd.conf $tmpfile
|
||||
chown --reference=./%{sysconfdir}/httpd.conf $tmpfile
|
||||
cmp -s $tmpfile ./%{sysconfdir}/httpd.conf || cp -p $tmpfile ./%{sysconfdir}/httpd.conf
|
||||
fi
|
||||
|
||||
rm -rf $tmpdir
|
||||
/usr/share/%{pname}/apache-20-22-upgrade
|
||||
/usr/share/%{pname}/get_module_list &>/dev/null
|
||||
exit 0
|
||||
|
||||
%verifyscript
|
||||
%verify_permissions -e %{_sbindir}/suexec2
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user