rpms/log4cpp/devel log4cpp-1.0-no-snprintf.patch, NONE, 1.1 log4cpp.spec, 1.2, 1.3

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/log4cpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30815/devel

Modified Files:
	log4cpp.spec 
Added Files:
	log4cpp-1.0-no-snprintf.patch 
Log Message:
fix licensing issue with Artistic licensed file

log4cpp-1.0-no-snprintf.patch:

--- NEW FILE log4cpp-1.0-no-snprintf.patch ---
diff -up log4cpp-1.0/src/Makefile.am.BAD log4cpp-1.0/src/Makefile.am
--- log4cpp-1.0/src/Makefile.am.BAD	2009-02-02 14:08:21.000000000 -0500
+++ log4cpp-1.0/src/Makefile.am	2009-02-02 14:08:31.000000000 -0500
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liblog4cpp.la
 
 INCLUDES = -I$(top_srcdir)/include
 
-noinst_HEADERS = snprintf.c Localtime.hh
+noinst_HEADERS = Localtime.hh
 
 liblog4cpp_la_SOURCES = \
 	Appender.cpp \
diff -up log4cpp-1.0/src/Makefile.in.BAD log4cpp-1.0/src/Makefile.in
--- log4cpp-1.0/src/Makefile.in.BAD	2009-02-02 14:08:12.000000000 -0500
+++ log4cpp-1.0/src/Makefile.in	2009-02-02 14:08:18.000000000 -0500
@@ -245,7 +245,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = liblog4cpp.la
 INCLUDES = -I$(top_srcdir)/include
-noinst_HEADERS = snprintf.c Localtime.hh
+noinst_HEADERS = Localtime.hh
 liblog4cpp_la_SOURCES = \
 	Appender.cpp \
 	AppenderSkeleton.cpp \


Index: log4cpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4cpp/devel/log4cpp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4cpp.spec	15 Dec 2008 21:37:14 -0000	1.2
+++ log4cpp.spec	2 Feb 2009 19:38:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           log4cpp
 Version:        1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ logging library
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@
 Patch1:         log4cpp-1.0-remove-pc-cflags.patch
 # Install docs into DESTDIR
 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++
@@ -42,6 +44,10 @@
 %patch0 -p 1 -b .gcc43
 %patch1 -p 1 -b .no-cflags
 %patch2 -p 1 -b .doc-dest
+%patch3 -p1 -b .no-snprintf
+# Delete non-free (but freely distributable) file under Artistic 1.0
+# just to be sure we're not using it.
+rm -rf src/snprintf.c
 
 %build
 aclocal -I m4
@@ -85,5 +91,10 @@
 
 
 %changelog
+* Mon Feb  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-2
+- Delete non-free (but freely distributable) snprintf.c under Artistic 1.0 
+  just to be sure we're not using it.
+
+
 * Mon Dec 15 2008 Jon McCann <jmccann at redhat.com> - 1.0-1
 - Initial package