rpms/log4cpp/F-10 import.log, NONE, 1.1 log4cpp-1.0-fix-doc-dest.patch, NONE, 1.1 log4cpp-1.0-gcc43.patch, NONE, 1.1 log4cpp-1.0-remove-pc-cflags.patch, NONE, 1.1 log4cpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

William Jon McCann mccann at fedoraproject.org
Mon Dec 15 20:47:43 UTC 2008 

Author: mccann

Update of /cvs/pkgs/rpms/log4cpp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11086/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log log4cpp-1.0-fix-doc-dest.patch 
	log4cpp-1.0-gcc43.patch log4cpp-1.0-remove-pc-cflags.patch 
	log4cpp.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
log4cpp-1_0-1_fc10:F-10:log4cpp-1.0-1.fc10.src.rpm:1229373704

log4cpp-1.0-fix-doc-dest.patch:

--- NEW FILE log4cpp-1.0-fix-doc-dest.patch ---
--- log4cpp-1.0.orig/doc/Makefile.am	2007-09-03 05:50:42.000000000 -0400
+++ log4cpp-1.0/doc/Makefile.am	2008-12-12 12:14:24.000000000 -0500
@@ -1,7 +1,7 @@
 SUBDIRS = html
 
 man3dir = $(mandir)/man3
-docdir  = $(prefix)/doc/@PACKAGE_TARNAME at -@PACKAGE_VERSION@
+docdir  = $(prefix)/share/doc/@PACKAGE_TARNAME at -@PACKAGE_VERSION@
 
 EXTRA_DIST = \
 	mainPage.txt
@@ -22,23 +22,23 @@
 
 
 install-data-local:
-	$(mkinstalldirs) $(man3dir)
+	$(mkinstalldirs) $(DESTDIR)/$(man3dir)
 	@for i in ./man/man3/log4cpp.3 ./man/man3/log4cpp_*.3; do \
 		inst=`basename $$i | sed 's/_/::/g'`; \
 		echo "$(INSTALL_DATA) $$i$(man3dir)/$$inst"; \
-		$(INSTALL_DATA) $$i $(man3dir)/$$inst; \
+		$(INSTALL_DATA) $$i $(DESTDIR)/$(man3dir)/$$inst; \
 	done
-	$(mkinstalldirs) $(docdir)
-	cp -r html/. $(docdir)
-	$(RM) -r -f $(docdir)/CVS \
-		$(docdir)/Makefile.am \
-		$(docdir)/Makefile.in \
-		$(docdir)/Makefile
+	$(mkinstalldirs) $(DESTDIR)/$(docdir)
+	cp -r html/. $(DESTDIR)/$(docdir)
+	$(RM) -r -f $(DESTDIR)/$(docdir)/CVS \
+		$(DESTDIR)/$(docdir)/Makefile.am \
+		$(DESTDIR)/$(docdir)/Makefile.in \
+		$(DESTDIR)/$(docdir)/Makefile
 
 uninstall-local:
-	$(RM) $(man3dir)/log4cpp.3
-	$(RM) $(man3dir)/log4cpp::*.3
-	$(RM) -r -f $(docdir)
+	$(RM) $(DESTDIR)/$(man3dir)/log4cpp.3
+	$(RM) $(DESTDIR)/$(man3dir)/log4cpp::*.3
+	$(RM) -r -f $(DESTDIR)/$(docdir)
 
 clean-local:
 	$(RM) -r latex

log4cpp-1.0-gcc43.patch:

--- NEW FILE log4cpp-1.0-gcc43.patch ---
Only in log4cpp-1.0: config.log
diff -ru log4cpp-1.0.orig/src/BasicLayout.cpp log4cpp-1.0/src/BasicLayout.cpp
--- log4cpp-1.0.orig/src/BasicLayout.cpp	2006-09-30 02:03:20.000000000 -0400
+++ log4cpp-1.0/src/BasicLayout.cpp	2008-12-12 12:01:16.000000000 -0500
@@ -8,6 +8,8 @@
  */
 
 #include "PortabilityImpl.hh"
+#include <cstdlib>
+#include <memory>
 #include <log4cpp/BasicLayout.hh>
 #include <log4cpp/Priority.hh>
 #include <log4cpp/FactoryParams.hh>
Only in log4cpp-1.0/src: BasicLayout.cpp~
Only in log4cpp-1.0/src: BasicLayout.cpp.gcc43
Only in log4cpp-1.0/src/.deps: BasicLayout.Tpo
Only in log4cpp-1.0/src/.deps: PatternLayout.Plo
Only in log4cpp-1.0.orig/src/.deps: PatternLayout.Tpo
Only in log4cpp-1.0/src/.libs: PatternLayout.o
diff -ru log4cpp-1.0.orig/src/PatternLayout.cpp log4cpp-1.0/src/PatternLayout.cpp
--- log4cpp-1.0.orig/src/PatternLayout.cpp	2007-08-28 03:54:12.000000000 -0400
+++ log4cpp-1.0/src/PatternLayout.cpp	2008-12-12 11:57:59.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include "PortabilityImpl.hh"
 
+#include <cstdlib>
 #include <log4cpp/PatternLayout.hh>
 #include <log4cpp/Priority.hh>
 #include <log4cpp/NDC.hh>
Only in log4cpp-1.0/src: PatternLayout.cpp.gcc43
Only in log4cpp-1.0/src: PatternLayout.lo
Only in log4cpp-1.0.orig/src: PatternLayout.loT
Only in log4cpp-1.0/src: PatternLayout.o

log4cpp-1.0-remove-pc-cflags.patch:

--- NEW FILE log4cpp-1.0-remove-pc-cflags.patch ---
--- log4cpp-1.0.orig/log4cpp.pc.in	2008-12-12 11:37:04.000000000 -0500
+++ log4cpp-1.0/log4cpp.pc.in	2008-12-12 12:07:24.000000000 -0500
@@ -6,5 +6,5 @@
 Name: @PACKAGE@
 Description: C++ library for flexible logging, modeled after Log4j
 Version: @VERSION@
-Libs: -L${libdir} @log4cpp_libs@
+Libs: -L${libdir}
 Cflags: -I${includedir} @log4cpp_cflags@
--- log4cpp-1.0.orig/m4/ac_config_pkgconfig_in.m4	2004-01-27 05:27:38.000000000 -0500
+++ log4cpp-1.0/m4/ac_config_pkgconfig_in.m4	2008-12-12 12:10:47.000000000 -0500
@@ -121,7 +121,7 @@
 fi
 echo 'Version: @VERSION@' >>$PKGCONFIG_FILE
 echo 'Libs: -L${libdir} @MODULE_DOWN[]_libs@' >>$PKGCONFIG_FILE
-echo 'Cflags: -I${includedir} @MODULE_DOWN[]_cflags@' >>$PKGCONFIG_FILE
+echo 'Cflags: -I${includedir}' >>$PKGCONFIG_FILE
 m4_pushdef([PKGCONFIG_UP], [m4_translit([$1], [a-z], [A-Z])])dnl
 PKGCONFIG_UP[]_PKGCONFIG="PKGCONFIG_DIR[]$1-config"
 AC_SUBST(PKGCONFIG_UP[]_PKGCONFIG)


--- NEW FILE log4cpp.spec ---
Name:           log4cpp
Version:        1.0
Release:        1%{?dist}
Summary:        C++ logging library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://sourceforge.net/projects/log4cpp/
Source0:        http://downloads.sourceforge.net/log4cpp/%{name}-%{version}.tar.gz
# Fix errors when compiling with gcc >= 4.3
Patch0:         log4cpp-1.0-gcc43.patch
# Don't put build cflags in .pc
Patch1:         log4cpp-1.0-remove-pc-cflags.patch
# Install docs into DESTDIR
Patch2:         log4cpp-1.0-fix-doc-dest.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++
BuildRequires:  doxygen
BuildRequires:  automake, autoconf, libtool

%description
A library of C++ classes for flexible logging to files, syslog, IDSA and
other destinations. It is modeled after the Log for Java library
(http://www.log4j.org), staying as close to their API as is reasonable.


%package devel
Summary:        Header files, libraries and development documentation for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description devel
This package contains the header files, static libraries and development
documentation for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.


%prep
%setup -q
%patch0 -p 1 -b .gcc43
%patch1 -p 1 -b .no-cflags
%patch2 -p 1 -b .doc-dest

%build
aclocal -I m4
autoconf
autoheader
automake --add-missing --copy
libtoolize --copy --force
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%{__mv} %{buildroot}/usr/share/doc/log4cpp-%{version} rpmdocs

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO rpmdocs/*
%doc %{_mandir}/man3/log4cpp*
%{_libdir}/liblog4cpp.so.*

%files devel
%defattr(-, root, root, 0755)
%{_bindir}/log4cpp-config
%{_includedir}/log4cpp/
%{_libdir}/liblog4cpp.so
%{_libdir}/pkgconfig/log4cpp.pc
%{_datadir}/aclocal/log4cpp.m4
%exclude %{_libdir}/*.a
%exclude %{_libdir}/*.la


%changelog
* Fri Dec 12 2008 Jon McCann <jmccann at redhat.com> - 1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/log4cpp/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2008 20:13:36 -0000	1.1
+++ .cvsignore	15 Dec 2008 20:47:12 -0000	1.2
@@ -0,0 +1 @@
+log4cpp-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/log4cpp/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2008 20:13:36 -0000	1.1
+++ sources	15 Dec 2008 20:47:12 -0000	1.2
@@ -0,0 +1 @@
+1face50ead0790d1297dfb04bacf273c  log4cpp-1.0.tar.gz

More information about the fedora-extras-commits mailing list