From 48593e589212ce165918f066a4e1189155884dca Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Jun 02 2006 13:57:39 +0000
Subject: - make -devel package multilib-safe (#192686)


---

diff --git a/httpd-2.1.10-apxs.patch b/httpd-2.1.10-apxs.patch
index 96d7c21..15afdeb 100644
--- a/httpd-2.1.10-apxs.patch
+++ b/httpd-2.1.10-apxs.patch
@@ -1,10 +1,28 @@
 
 - remove unnecessary stuff which runs httpd during build
 - drop unnecessary --libs output from ap?-?-config
+- make multilib-safe
 
---- httpd-2.1.10/support/apxs.in.apxs
-+++ httpd-2.1.10/support/apxs.in
-@@ -184,34 +184,6 @@
+--- httpd-2.2.2/support/apxs.in.apxs
++++ httpd-2.2.2/support/apxs.in
+@@ -25,7 +25,15 @@
+ 
+ my %config_vars = ();
+ 
+-my $installbuilddir = "@exp_installbuilddir@";
++# Awful hack to make apxs libdir-agnostic:
++my $pkg_config = "/usr/bin/pkg-config";
++if (! -x "$pkg_config") {
++    error("$pkg_config not found!");
++    exit(1);
++}
++
++my $installbuilddir = `pkg-config --variable=libdir apr-1` . "httpd/build";
++
+ get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
+ 
+ # read the configuration variables once
+@@ -184,34 +192,6 @@
      }
  }
  
@@ -39,7 +57,7 @@
  sub get_config_vars{
      my ($file, $rh_config) = @_;
  
-@@ -433,9 +405,9 @@
+@@ -433,9 +413,9 @@
  
      if ($opt_p == 1) {
          
diff --git a/httpd.spec b/httpd.spec
index f4786ec..07bb6e4 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.2
-Release: 3
+Release: 4
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -251,9 +251,6 @@ mkdir $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_proxy
 mv $RPM_BUILD_ROOT%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
    $RPM_BUILD_ROOT%{_bindir}
 
-# move builddir to the right place
-#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
 
@@ -288,7 +285,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/httpd
 ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
 ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run
 ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
-ln -s ../..%{_libdir}/httpd/build $RPM_BUILD_ROOT/etc/httpd/build
 
 # install SYSV init stuff
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -312,6 +308,10 @@ sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \
     -e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
   > $RPM_BUILD_ROOT%{_mandir}/man8/httpd.8
 
+# Make ap_config_layout.h libdir-agnostic
+sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
+    $RPM_BUILD_ROOT%{_includedir}/httpd/ap_config_layout.h
+
 # Remove unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp \
       $RPM_BUILD_ROOT/etc/httpd/conf/mime.types \
@@ -472,7 +472,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %{_includedir}/httpd
-%{_sysconfdir}/httpd/build
 %{_sbindir}/apxs
 %{_mandir}/man8/apxs.8*
 %dir %{_libdir}/httpd/build
@@ -480,6 +479,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Jun  2 2006 Joe Orton <jorton@redhat.com> 2.2.2-4
+- make -devel package multilib-safe (#192686)
+
 * Thu May 11 2006 Joe Orton <jorton@redhat.com> 2.2.2-3
 - build DSOs using -z relro linker flag