Author: atler Date: Wed May 19 13:23:15 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.2.1
---- Files affected: packages/log4c: log4c-nolatex.patch (1.1 -> 1.2) , log4c.spec (1.12 -> 1.13) , log4c-cxx.patch (NONE -> 1.1) (NEW), log4c-m4.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/log4c/log4c-nolatex.patch diff -u packages/log4c/log4c-nolatex.patch:1.1 packages/log4c/log4c-nolatex.patch:1.2 --- packages/log4c/log4c-nolatex.patch:1.1 Tue Jul 29 14:51:11 2003 +++ packages/log4c/log4c-nolatex.patch Wed May 19 15:23:09 2010 @@ -1,41 +1,15 @@ -diff -Nur log4c-1.0.10.orig/doc/Doxyfile.in log4c-1.0.10.chng/doc/Doxyfile.in ---- log4c-1.0.10.orig/doc/Doxyfile.in Wed May 1 18:50:48 2002 -+++ log4c-1.0.10.chng/doc/Doxyfile.in Tue Jul 29 13:57:47 2003 -@@ -98,7 +98,7 @@ - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output - #--------------------------------------------------------------------------- --GENERATE_LATEX = YES -+GENERATE_LATEX = NO - LATEX_OUTPUT = latex - COMPACT_LATEX = YES - PAPER_TYPE = a4wide -diff -Nur log4c-1.0.10.orig/doc/Makefile.am log4c-1.0.10.chng/doc/Makefile.am ---- log4c-1.0.10.orig/doc/Makefile.am Wed Apr 10 11:55:37 2002 -+++ log4c-1.0.10.chng/doc/Makefile.am Tue Jul 29 14:04:07 2003 -@@ -5,16 +5,11 @@ - $(top_srcdir)/AUTHORS \ - $(top_srcdir)/NEWS \ - $(top_srcdir)/COPYING \ -- $(top_srcdir)/ChangeLog \ -- $(PACKAGE).pdf -+ $(top_srcdir)/ChangeLog - - --all-local: $(PACKAGE).pdf -- --$(PACKAGE).pdf: Doxyfile main.doc -+all-local: Doxyfile main.doc - @DOXYGEN@ -- $(MAKE) -C ./latex pdf -- cp -f ./latex/refman.pdf $(PACKAGE).pdf - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(man3dir) -@@ -41,5 +36,5 @@ - rm -rf $(docdir)/* - - clean-local: -- $(RM) -r latex man html $(PACKAGE).pdf doxygen.log -+ $(RM) -r latex man html doxygen.log +--- configure.in.orig 2010-01-01 14:29:57.000000000 +0100 ++++ configure.in 2010-01-01 14:30:11.000000000 +0100 +@@ -161,11 +161,7 @@ + AC_SUBST(HAVE_DOT) + # Similar for latex +-HAVE_LATEX=YES +-AC_PATH_PROG(LATEX, latex, ) +-if test x$LATEX = x; then +- HAVE_LATEX=NO +-fi ++HAVE_LATEX=NO + # This variable is used to turn LATEX on and off in the Doxyfile + AC_SUBST(HAVE_LATEX) + # This variable is used in doc/Makefile.am to set the target to make ================================================================ Index: packages/log4c/log4c.spec diff -u packages/log4c/log4c.spec:1.12 packages/log4c/log4c.spec:1.13 --- packages/log4c/log4c.spec:1.12 Tue Feb 13 07:46:52 2007 +++ packages/log4c/log4c.spec Wed May 19 15:23:09 2010 @@ -2,14 +2,16 @@ Summary: Library for flexible logging Summary(pl.UTF-8): Biblioteka do elastycznego logowania Name: log4c -Version: 1.0.12 +Version: 1.2.1 Release: 1 License: LGPL Group: Development/Libraries Source0: http://dl.sourceforge.net/log4c/%{name}-%{version}.tar.gz -# Source0-md5: 334d38ed163b26b1be48364b445ad170 +# Source0-md5: ca5412b7515d8901714ab7892323adb6 Patch0: %{name}-nolatex.patch Patch1: %{name}-doc.patch +Patch2: %{name}-cxx.patch +Patch3: %{name}-m4.patch URL: http://log4cpp.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -51,13 +53,15 @@ %prep %setup -q -%patch0 -p1 +%patch0 %patch1 -p1 +%patch2 +%patch3 %build rm -f missing %{__libtoolize} -%{__aclocal} +%{__aclocal} -Iconfig %{__autoconf} %{__autoheader} %{__automake} @@ -106,6 +110,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2010/05/19 13:23:09 atler +- up to 1.2.1 + Revision 1.12 2007/02/13 06:46:52 glen - tabs in preamble ================================================================ Index: packages/log4c/log4c-cxx.patch diff -u /dev/null packages/log4c/log4c-cxx.patch:1.1 --- /dev/null Wed May 19 15:23:16 2010 +++ packages/log4c/log4c-cxx.patch Wed May 19 15:23:09 2010 @@ -0,0 +1,10 @@ +--- configure.in.orig 2010-01-01 14:39:54.000000000 +0100 ++++ configure.in 2010-01-01 14:40:02.000000000 +0100 +@@ -37,6 +37,7 @@ + #. + AC_PROG_YACC + AC_PROG_CC ++AC_PROG_CXX + AC_PROG_CPP + AM_PROG_LEX + AC_PROG_AWK ================================================================ Index: packages/log4c/log4c-m4.patch diff -u /dev/null packages/log4c/log4c-m4.patch:1.1 --- /dev/null Wed May 19 15:23:16 2010 +++ packages/log4c/log4c-m4.patch Wed May 19 15:23:09 2010 @@ -0,0 +1,11 @@ +--- log4c.m4.orig 2010-05-19 15:15:14.000000000 +0200 ++++ log4c.m4 2010-05-19 15:15:26.000000000 +0200 +@@ -4,7 +4,7 @@ + dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS + dnl +-AC_DEFUN(AM_PATH_LOG4C, ++AC_DEFUN([AM_PATH_LOG4C], + [dnl + dnl Get the cflags and libraries from the log4c-config script + dnl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/log4c/log4c-nolatex.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/log4c/log4c.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
