[log4c] Change log4c-config so log4c-devel can be installed on multilib systems.

František Dvořák valtri at fedoraproject.org
Sat Dec 8 16:25:00 UTC 2012


commit d071d744b672004bae63044d4acdc47518b366db
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Sat Dec 8 17:23:41 2012 +0100

    Change log4c-config so log4c-devel can be installed on multilib systems.

 log4c.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/log4c.spec b/log4c.spec
index 38713d8..da09431 100644
--- a/log4c.spec
+++ b/log4c.spec
@@ -40,6 +40,12 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/usr/share/doc/%{name}-%{version}
 mv %{buildroot}/etc/log4crc.sample %{buildroot}/usr/share/doc/%{name}-%{version}/
 rm %{buildroot}%{_libdir}/*.la
+# munge log4c-config to prevent file conflicts on multilib systems,
+# the default paths are not needed in the build flags anyway
+sed -r -i \
+	-e 's|^libdir=/usr/lib(64)?$|libdir=/usr/lib|' \
+	-e 's|-L\$libdir ||' \
+	-e 's|-I\$includedir ||' %{buildroot}%{_bindir}/log4c-config
 
 
 %post -p /sbin/ldconfig
@@ -61,6 +67,9 @@ rm %{buildroot}%{_libdir}/*.la
 
 
 %changelog
+* Sat Dec 08 2012 František Dvořák <valtri at civ.zcu.cz> - 1.2.2-1
+- Unify log4c-config to make log4c-devel installable on multilib systems
+
 * Mon Dec 04 2012 František Dvořák <valtri at civ.zcu.cz> - 1.2.2-1
 - Release log4c 1.2.2
 - Removed the m4 patch, now in upstream


More information about the scm-commits mailing list