[libecap] Fixed: #831404 - multilib conflicts due to platform dependent autoconf.h

[mluscon]

commit 0a3949943df64286e05a22d4af9a62c94cf41062
Author: Michal Luscon <mluscon at redhat.com>
Date:   Mon Sep 16 12:25:25 2013 +0200

    Fixed: #831404 - multilib conflicts due to platform dependent autoconf.h

 .gitignore   |    1 +
 libecap.spec |   11 ++++++++++-
 sources      |    1 +
 3 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1a9ed1..3e246f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libecap-0.0.3.tar.gz
 /libecap-0.2.0.tar.gz
+/autoconf.h
diff --git a/libecap.spec b/libecap.spec
index 05c3018..74c300d 100644
--- a/libecap.spec
+++ b/libecap.spec
@@ -1,11 +1,12 @@
 Name:       libecap
 Version:    0.2.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Squid interface for embedded adaptation modules
 License:    BSD
 Group:      Development/Libraries
 URL:        http://www.e-cap.org/
 Source0:    http://www.measurement-factory.com/tmp/ecap/%{name}-%{version}.tar.gz
+Source1:    autoconf.h
 
 %description
 eCAP is a software interface that allows a network application, such as an 
@@ -45,6 +46,11 @@ make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/libecap.a
 rm -f %{buildroot}%{_libdir}/libecap.la
 
+# Rename libecap/common/autoconf.h to libecap/common/autoconf-<arch>.h to avoid file conflicts on
+# multilib systems and install autoconf.h wrapper
+mv %{buildroot}%{_includedir}/%{name}/common/autoconf.h %{buildroot}%{_includedir}/%{name}/common/autoconf-%{_arch}.h
+install -m644 %{SOURCE1} %{buildroot}%{_includedir}/%{name}/common/autoconf.h
+
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -58,6 +64,9 @@ rm -f %{buildroot}%{_libdir}/libecap.la
 %{_includedir}/libecap
 
 %changelog
+* Mon Sep 16 2013 Michal Luscon <mluscon at redhat.com> - 0.2.0-7
+- Fixed: #831404 - multilib conflicts due to platform dependent autoconf.h
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 125dd73..d290f17 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+a7ad17bbcafb1f60d62aed279bbc1b5d  autoconf.h
 e65a855f4fbb0f3136af7fe28249e883  libecap-0.2.0.tar.gz