diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 4a3538aa2b1f090d724c6d8f19476a238d21ffa7..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# log4cpp - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index c861df73d1e10e29aad592fd3e113c50baf15141..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# log4cpp - -#### 介绍 -{**以下是 Gitee 平台说明，您可以替换此简介** -Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/log4cpp-1.0-fix-doc-dest.patch b/log4cpp-1.0-fix-doc-dest.patch new file mode 100644 index 0000000000000000000000000000000000000000..aa7f60c4afed262dfc9bf082d695bc83e8102209 --- /dev/null +++ b/log4cpp-1.0-fix-doc-dest.patch @@ -0,0 +1,46 @@ +--- 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@-@PACKAGE_VERSION@ ++docdir = $(prefix)/share/doc/@PACKAGE_TARNAME@-@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 diff --git a/log4cpp-1.0-gcc43.patch b/log4cpp-1.0-gcc43.patch new file mode 100644 index 0000000000000000000000000000000000000000..9979426b789dacbcb15ec9fb9045b0e2f35dfe07 --- /dev/null +++ b/log4cpp-1.0-gcc43.patch @@ -0,0 +1,34 @@ +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 ++#include + #include + #include + #include +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 + #include + #include + #include +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 diff --git a/log4cpp-1.0-no-snprintf.patch b/log4cpp-1.0-no-snprintf.patch new file mode 100644 index 0000000000000000000000000000000000000000..bd367df9bbf56392a6f8651a01e2a764cae417ef --- /dev/null +++ b/log4cpp-1.0-no-snprintf.patch @@ -0,0 +1,24 @@ +diff -up log4cpp/src/Makefile.am.no-snprintf log4cpp/src/Makefile.am +--- log4cpp/src/Makefile.am.no-snprintf 2017-07-12 23:39:11.000000000 -0600 ++++ log4cpp/src/Makefile.am 2019-11-20 09:24:22.934246996 -0700 +@@ -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/src/Makefile.in.no-snprintf log4cpp/src/Makefile.in +--- log4cpp/src/Makefile.in.no-snprintf 2019-11-20 09:24:22.936246987 -0700 ++++ log4cpp/src/Makefile.in 2019-11-20 09:25:05.758058149 -0700 +@@ -297,7 +297,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 \ + AppendersFactory.cpp BufferingAppender.cpp FactoryParams.cpp \ + LayoutsFactory.cpp LevelEvaluator.cpp Localtime.cpp \ diff --git a/log4cpp-1.0-remove-pc-cflags.patch b/log4cpp-1.0-remove-pc-cflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..00d4d3e023371e8077e979cda8b5690109789f3c --- /dev/null +++ b/log4cpp-1.0-remove-pc-cflags.patch @@ -0,0 +1,20 @@ +--- 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) diff --git a/log4cpp-1.1.3.tar.gz b/log4cpp-1.1.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..920e9da72e06e85c0569ac7c8447f98962454c82 Binary files /dev/null and b/log4cpp-1.1.3.tar.gz differ diff --git a/log4cpp-version-1.1.3.patch b/log4cpp-version-1.1.3.patch new file mode 100644 index 0000000000000000000000000000000000000000..79e2999c9e75bf51c2012cb5fddf5e0f5d7b123a --- /dev/null +++ b/log4cpp-version-1.1.3.patch @@ -0,0 +1,9 @@ +diff -uNr log4cpp.ORIG/configure.in log4cpp/configure.in +--- log4cpp.ORIG/configure.in 2015-03-23 14:35:01.946455951 +0100 ++++ log4cpp/configure.in 2015-03-23 14:35:25.304824413 +0100 +@@ -1,4 +1,4 @@ +-AC_INIT(log4cpp, 1.1) ++AC_INIT(log4cpp, 1.1.3) + + # autoconf 2.50 or higher to rebuild aclocal.m4, because the + # AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro. diff --git a/log4cpp.spec b/log4cpp.spec new file mode 100644 index 0000000000000000000000000000000000000000..21ab45e4ecadd0b82fc60dc7f0decbf4927cbb7f --- /dev/null +++ b/log4cpp.spec @@ -0,0 +1,185 @@ +Name: log4cpp +Version: 1.1.3 +Release: 1%{?dist} +Summary: C++ logging library + +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 +# Don't try to build snprintf.c +Patch3: log4cpp-1.0-no-snprintf.patch +# Version is actually 1.1.3 +Patch4: log4cpp-version-1.1.3.patch + +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 man pages %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%if 0%{?el4}%{?el5} +Requires: pkgconfig +%endif + +%description devel +This package contains the header files, static libraries and development +man pages for %{name}. If you like to develop programs using %{name}, +you will need to install %{name}-devel. + +%package doc +Summary: Development documentation for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description doc +This package contains the development documentation for %{name}. +If you like to documentation to develop programs using %{name}, +you will need to install %{name}-devel. + +%prep +%setup -q -n log4cpp +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 -b .no-snprintf +%patch4 -p1 +# 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 +#Convert line endings. +iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog + +%build +aclocal -I m4 +autoconf +autoheader +automake --add-missing --copy +libtoolize --copy --force +%configure +make %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} +mv %{buildroot}/usr/share/doc/log4cpp-%{version} rpmdocs +rm -f %{buildroot}%{_libdir}/*.a +rm -f %{buildroot}%{_libdir}/*.la + +%ldconfig_scriptlets + +%files +%{_libdir}/liblog4cpp.so.5* +%doc ChangeLog COPYING + +%files devel +%{_bindir}/log4cpp-config +%{_includedir}/log4cpp/ +%{_libdir}/liblog4cpp.so +%{_libdir}/pkgconfig/log4cpp.pc +%{_datadir}/aclocal/log4cpp.m4 +%{_mandir}/man3/log4cpp* + +%files doc +%doc rpmdocs/* + +%changelog +* Wed Nov 20 2019 Orion Poplawski - 1.1.3-1 +- Update to 1.1.3 + +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 1.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.1.1-2 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Mar 23 2015 Steve Traylen - 1.1.1-1 +- New upstream 1.1.1 + +* Sun Aug 17 2014 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Sep 19 2013 Steve Traylen - 1.1-1 +- New upstream 1.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon May 21 2012 Peter Robinson - 1.0-9 +- Fix FTBFS + +* Tue Feb 28 2012 Fedora Release Engineering - 1.0-8 +- Rebuilt for c++ ABI breakage + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Apr 29 2011 Steve Traylen - 1.0-6 +- Remove useless AUTHORS INSTALL NEWS README THANKS TODO +- Move API man pages to devel package. +- Move API html pages to a seperate -docs package. +- Explicit pkgconfig requires needed on el5 only. +- Remove .la and .a files in install rather than files section. +- Use buildroot rather than RPM_BUILD_ROOT everywhere. +- Add _isa tags to requires. +- Convert ChangeLog to utf8. +- Remove api/installdox for installing documentaion. + +* Tue Feb 08 2011 Fedora Release Engineering - 1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jul 25 2009 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 2 2009 Tom "spot" Callaway - 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 - 1.0-1 +- Initial package