Commit dd1a262d authored by Graham Leggett's avatar Graham Leggett
Browse files

RPM: Introduce a proper layout for RPM, removing the need for script 

gymnastics and replacement configuration files in order to get the
configuration paths to match up correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1207968 13f79535-47bb-0310-9956-ffa450edef68
parent 421430f9

build/rpm/httpd.spec.in

+2 −13
Changes for build/rpm/httpd.spec.in: 2 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -122,11 +122,7 @@ rm -rf srclib/{apr,apr-util,pcre} 
	support/apxs.in



%configure \

 	--prefix=%{_sysconfdir}/httpd \

        --exec-prefix=%{_prefix} \

 	--bindir=%{_bindir} \

 	--sbindir=%{_sbindir} \

 	--mandir=%{_mandir} \

	--enable-layout=RPM \

	--libdir=%{_libdir} \

	--sysconfdir=%{_sysconfdir}/httpd/conf \

	--includedir=%{_includedir}/httpd \
@@ -160,15 +156,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav 
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_ssl

touch $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_ssl/scache.{dir,pag,sem}



# move the build directory to within the library directory

mv $RPM_BUILD_ROOT%{contentdir}/build $RPM_BUILD_ROOT%{_libdir}/httpd/build



# Make the MMN accessible to module packages

echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn



# docroot

mkdir $RPM_BUILD_ROOT%{contentdir}/html



# Set up /var directories

mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/httpd

mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/cache-root
@@ -404,14 +394,13 @@ rm -rf $RPM_BUILD_ROOT 


%dir %{contentdir}

%dir %{contentdir}/cgi-bin

%dir %{contentdir}/htdocs

%dir %{contentdir}/html

%dir %{contentdir}/icons

%dir %{contentdir}/error

%dir %{contentdir}/error/include

%{contentdir}/icons/*

%{contentdir}/error/README

%{contentdir}/htdocs/index.html

%{contentdir}/html/index.html

%config(noreplace) %{contentdir}/error/*.var

%config(noreplace) %{contentdir}/error/include/*.html

config.layout

+25 −0
Changes for config.layout: 25 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -298,3 +298,28 @@ 
    installbuilddir: ${prefix}/usr/share/apache2/build

    errordir:      ${datadir}/error

</Layout>



# Generic RPM layout

<Layout RPM>

    prefix:        /usr

    exec_prefix:   ${prefix}

    bindir:        ${prefix}/bin

    sbindir:       ${prefix}/sbin

    libdir:        ${prefix}/lib

    libexecdir:    ${libdir}/httpd/modules

    mandir:        ${prefix}/share/man

    sysconfdir:    /etc/httpd/conf

    installbuilddir: ${libdir}/httpd/build

    includedir:    ${prefix}/include/httpd

    localstatedir: /var

    datadir:       ${localstatedir}/www

    errordir:      ${datadir}/error

    iconsdir:      ${datadir}/icons

    htdocsdir:     ${datadir}/html

    manualdir:     ${datadir}/manual

    cgidir:        ${datadir}/cgi-bin

    runtimedir:    ${localstatedir}/run

    logfiledir:    ${localstatedir}/log/httpd

    proxycachedir: ${localstatedir}/cache/httpd/cache-root

</Layout>