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

- Remove pointless creation of /var/lib/httpd/state dir in RPM build root

Browse Source 
- Substitute tabs for spaces.
This commit is contained in:
Lubos Uhliarik 2019-07-19 11:28:20 +02:00
parent 2993aea7a7
commit fc0e844ce2
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
httpd.spec
View File

@ -276,7 +276,7 @@ autoheader && autoconf || exit 1
# Before configure; fix location of build dir in generated apxs # Before configure; fix location of build dir in generated apxs
%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \ %{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
support/apxs.in support/apxs.in
export CFLAGS=$RPM_OPT_FLAGS export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS="-Wl,-z,relro,-z,now" export LDFLAGS="-Wl,-z,relro,-z,now"
@ -286,34 +286,34 @@ export LYNX_PATH=/usr/bin/links
# Build the daemon # Build the daemon
./configure \ ./configure \
--prefix=%{_sysconfdir}/httpd \ --prefix=%{_sysconfdir}/httpd \
--exec-prefix=%{_prefix} \ --exec-prefix=%{_prefix} \
--bindir=%{_bindir} \ --bindir=%{_bindir} \
--sbindir=%{_sbindir} \ --sbindir=%{_sbindir} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
--sysconfdir=%{_sysconfdir}/httpd/conf \ --sysconfdir=%{_sysconfdir}/httpd/conf \
--includedir=%{_includedir}/httpd \ --includedir=%{_includedir}/httpd \
--libexecdir=%{_libdir}/httpd/modules \ --libexecdir=%{_libdir}/httpd/modules \
--datadir=%{contentdir} \ --datadir=%{contentdir} \
--enable-layout=Fedora \ --enable-layout=Fedora \
--with-installbuilddir=%{_libdir}/httpd/build \ --with-installbuilddir=%{_libdir}/httpd/build \
--enable-mpms-shared=all \ --enable-mpms-shared=all \
--with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
--enable-suexec --with-suexec \ --enable-suexec --with-suexec \
--enable-suexec-capabilities \ --enable-suexec-capabilities \
--with-suexec-caller=%{suexec_caller} \ --with-suexec-caller=%{suexec_caller} \
--with-suexec-docroot=%{docroot} \ --with-suexec-docroot=%{docroot} \
--without-suexec-logfile \ --without-suexec-logfile \
--with-suexec-syslog \ --with-suexec-syslog \
--with-suexec-bin=%{_sbindir}/suexec \ --with-suexec-bin=%{_sbindir}/suexec \
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \ --with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
--with-brotli \ --with-brotli \
--enable-pie \ --enable-pie \
--with-pcre \ --with-pcre \
--enable-mods-shared=all \ --enable-mods-shared=all \
--enable-ssl --with-ssl --disable-distcache \ --enable-ssl --with-ssl --disable-distcache \
--enable-proxy --enable-proxy-fdpass \ --enable-proxy --enable-proxy-fdpass \
--enable-cache \ --enable-cache \
--enable-disk-cache \ --enable-disk-cache \
--enable-ldap --enable-authnz-ldap \ --enable-ldap --enable-authnz-ldap \
@ -323,7 +323,7 @@ export LYNX_PATH=/usr/bin/links
--disable-imagemap --disable-file-cache \ --disable-imagemap --disable-file-cache \
--disable-http2 \ --disable-http2 \
--disable-md \ --disable-md \
$* $*
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -396,7 +396,6 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
# Other directories # Other directories
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
$RPM_BUILD_ROOT%{_localstatedir}/lib/httpd/state \
$RPM_BUILD_ROOT/run/httpd/htcacheclean $RPM_BUILD_ROOT/run/httpd/htcacheclean
# Substitute in defaults which are usually done (badly) by "make install" # Substitute in defaults which are usually done (badly) by "make install"
@ -471,11 +470,11 @@ ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
# install http-ssl-pass-dialog # install http-ssl-pass-dialog
mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \ install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \
$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog
# install http-ssl-gencerts # install http-ssl-gencerts
install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts \ install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts \
$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts
# Install scripts # Install scripts
install -m 755 apachectl.sh $RPM_BUILD_ROOT%{_sbindir}/apachectl install -m 755 apachectl.sh $RPM_BUILD_ROOT%{_sbindir}/apachectl
@ -489,7 +488,7 @@ done
# Install logrotate config # Install logrotate config
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \ install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
$RPM_BUILD_ROOT/etc/logrotate.d/httpd $RPM_BUILD_ROOT/etc/logrotate.d/httpd
# Install man pages # Install man pages
install -d $RPM_BUILD_ROOT%{_mandir}/man8 $RPM_BUILD_ROOT%{_mandir}/man5 install -d $RPM_BUILD_ROOT%{_mandir}/man8 $RPM_BUILD_ROOT%{_mandir}/man5