[log4c/el5: 13/13] Merge branch 'master' into el5

[František Dvořák]

commit 94a9bd0ddcb6fdd5483154f788dbb104d560af45
Merge: 476a30c 0a05439
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Sat Apr 6 18:45:47 2013 +0200

    Merge branch 'master' into el5

 .gitignore               |    2 +-
 507427-Fix-M4-file.patch |   12 --------
 log4c.spec               |   68 +++++++++++++++++++++++++++++++++++----------
 sources                  |    2 +-
 4 files changed, 55 insertions(+), 29 deletions(-)
---
diff --cc .gitignore
index cba5615,3f8a272..b36fb33
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
--log4c-1.2.1.tar.gz
 -/log4c-1.2.2.tar.gz
 -/log4c-1.2.3.tar.gz
++log4c-1.2.3.tar.gz
diff --cc log4c.spec
index b6f9f06,e265edd..ef454b0
--- a/log4c.spec
+++ b/log4c.spec
@@@ -1,21 -1,20 +1,22 @@@
  Name:		log4c
- Version:	1.2.1
- Release:	7%{?dist}
+ Version:	1.2.3
+ Release:	1%{?dist}
  Summary:	Library for logging application messages
  
 +Group:		System Environment/Libraries
  License:	LGPLv2+
  URL:		http://log4c.sourceforge.net/
  Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
- Patch0:		507427-Fix-M4-file.patch
 +BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
- BuildRequires:	expat-devel
+ 
+ BuildRequires:	expat-devel%{?_isa}
  
  %description
- Log4c is a C language library for flexible logging to files, syslog and other 
- destinations. It is modeled after the Log for Java library (log4j), 
+ Log4c is a C language library for flexible logging to files, syslog and other
+ destinations. It is modeled after the Log for Java library (log4j),
  staying as close to their API as is reasonable.
  
+ 
  %package devel
  Summary:	Header files, libraries and development documentation for %{name}
  Group:		Development/Libraries
@@@ -35,29 -33,35 +35,42 @@@ programs using %{name}, you will need t
  %configure --disable-static
  make %{?_smp_mflags}
  
+ 
  %install
 +rm -rf %{buildroot}
  make install DESTDIR=%{buildroot}
  # example config file below shouldn't live in /etc/
  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
+ 
  
 +%clean
 +rm -rf %{buildroot}
 +
++
  %post -p /sbin/ldconfig
  
+ 
  %postun -p /sbin/ldconfig
  
+ 
  %files
 -%doc COPYING AUTHORS ChangeLog README log4crc.sample
 +%defattr(-,root,root,-)
- %doc README log4crc.sample
- %{_libdir}/liblog4c.so.*
++%doc COPYING AUTHORS ChangeLog NEWS README log4crc.sample
+ %{_libdir}/liblog4c.so.3
+ %{_libdir}/liblog4c.so.3.*
  
  %files devel
 +%defattr(-,root,root,-)
  %{_libdir}/liblog4c.so
+ %{_libdir}/pkgconfig/*.pc
  %{_bindir}/*
  %{_includedir}/*
  %{_datadir}/aclocal/log4c.m4