[log4cpp] fix FTBFS due to new doxygen

Peter Robinson pbrobinson at fedoraproject.org
Mon May 21 08:43:01 UTC 2012


commit 4624bb670b151ff4fdfa0b1c66a4442b226f71dd
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 21 09:42:53 2012 +0100

    fix FTBFS due to new doxygen

 log4cpp.spec |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/log4cpp.spec b/log4cpp.spec
index d96caf2..8460b80 100644
--- a/log4cpp.spec
+++ b/log4cpp.spec
@@ -1,6 +1,6 @@
 Name:           log4cpp
 Version:        1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        C++ logging library
 
 Group:          Development/Libraries
@@ -15,7 +15,6 @@ Patch1:         log4cpp-1.0-remove-pc-cflags.patch
 Patch2:         log4cpp-1.0-fix-doc-dest.patch
 # Don't try to build snprintf.c
 Patch3:         log4cpp-1.0-no-snprintf.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
 BuildRequires:  doxygen
@@ -71,11 +70,8 @@ libtoolize --copy --force
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mv %{buildroot}/usr/share/doc/log4cpp-%{version} rpmdocs
-#Remove unescesary binary from docs dir.
-rm rpmdocs/api/installdox
 rm -f %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/*.la
 
@@ -83,9 +79,6 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-, root, root, 0755)
 %{_libdir}/liblog4cpp.so.*
@@ -105,6 +98,9 @@ rm -rf %{buildroot}
 %doc rpmdocs/*
 
 %changelog
+* Mon May 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0-9
+- Fix FTBFS
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-8
 - Rebuilt for c++ ABI breakage
 


More information about the scm-commits mailing list