diff options
| author | Graham Leggett <minfrin@apache.org> | 2011-11-29 17:56:47 +0100 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2011-11-29 17:56:47 +0100 |
| commit | 43147dad7150e877be4c2804656e01d018b19e46 (patch) | |
| tree | f5852653fe46142fac3edae717276937bd2635fe /build/rpm | |
| parent | Logic which makes the balancer "active" or not... so we can turn them (diff) | |
| download | apache2-43147dad7150e877be4c2804656e01d018b19e46.tar.xz apache2-43147dad7150e877be4c2804656e01d018b19e46.zip | |
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
Diffstat (limited to 'build/rpm')
| -rw-r--r-- | build/rpm/httpd.spec.in | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in index f4bf26236e..da8f548b32 100644 --- a/build/rpm/httpd.spec.in +++ b/build/rpm/httpd.spec.in @@ -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 |