From 4d1b04395172466d0e2c825976e3d7a29615a34ee2a68df90308ebfdac4e7b07 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 21 Dec 2018 04:53:38 +0000 Subject: [PATCH 1/2] Accepting request 660121 from home:marec2000:branches:devel:libraries:c_c++ - update to version 1.1.3 * no upstream changelog OBS-URL: https://build.opensuse.org/request/show/660121 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/log4cpp?expand=0&rev=10 --- _service | 22 ++++++++++++++ fix_sle11_build.patch | 20 ------------- log4cpp-1.1.2rc3.tar.gz | 3 -- log4cpp-1.1.3.tar.xz | 3 ++ log4cpp.changes | 6 ++++ log4cpp.spec | 63 ++++++++++++++++++----------------------- 6 files changed, 59 insertions(+), 58 deletions(-) create mode 100644 _service delete mode 100644 fix_sle11_build.patch delete mode 100644 log4cpp-1.1.2rc3.tar.gz create mode 100644 log4cpp-1.1.3.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..281d8b7 --- /dev/null +++ b/_service @@ -0,0 +1,22 @@ + + + prdownloads.sourceforge.net + http + /log4cpp/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/log4cpp-1.1.3.tar.gz + + + log4cpp-1.1.3.tar.gz + sha256 + 2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d + + + xz + log4cpp-1.1.3.tar.gz + + + log4cpp.spec + + + log4cpp.spec + + diff --git a/fix_sle11_build.patch b/fix_sle11_build.patch deleted file mode 100644 index ad1d752..0000000 --- a/fix_sle11_build.patch +++ /dev/null @@ -1,20 +0,0 @@ -Summary: Remove extra ; that prevents building on SLE11 - -Index: log4cpp/src/Appender.cpp -=================================================================== ---- log4cpp.orig/src/Appender.cpp -+++ log4cpp/src/Appender.cpp -@@ -18,11 +18,11 @@ namespace log4cpp { - - Appender::AppenderMapStorage::AppenderMapStorage() { - _allAppenders = new AppenderMap(); -- }; -+ } - Appender::AppenderMapStorage::~AppenderMapStorage() { - _deleteAllAppenders(); - delete _allAppenders; -- }; -+ } - - Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer() { - if (appenders_nifty_counter++ == 0) { diff --git a/log4cpp-1.1.2rc3.tar.gz b/log4cpp-1.1.2rc3.tar.gz deleted file mode 100644 index dd4c325..0000000 --- a/log4cpp-1.1.2rc3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d210517b7afe04a7238b0bd3a0bf504575ffa097a6c0eca02fc69a31b4763cd -size 580644 diff --git a/log4cpp-1.1.3.tar.xz b/log4cpp-1.1.3.tar.xz new file mode 100644 index 0000000..873ad0c --- /dev/null +++ b/log4cpp-1.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ce2d6645c2a2f5f77b6a2e759ba0a6bb08bb6d322c0110baf5cb95353d66b89 +size 356356 diff --git a/log4cpp.changes b/log4cpp.changes index 72e280c..efb8552 100644 --- a/log4cpp.changes +++ b/log4cpp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 19 19:46:01 UTC 2018 - marec@detebe.org + +- update to version 1.1.3 + * no upstream changelog + ------------------------------------------------------------------- Mon Oct 10 15:33:28 UTC 2016 - adam.majer@suse.de diff --git a/log4cpp.spec b/log4cpp.spec index 9e5a6f2..81f9bea 100644 --- a/log4cpp.spec +++ b/log4cpp.spec @@ -1,7 +1,7 @@ # # spec file for package log4cpp # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,43 +17,36 @@ Name: log4cpp -%if 0%{suse_version} >= 1310 -Version: 1.1.2~rc3 +Version: 1.1.3 Release: 0 -%else -Version: 1.1.2 -Release: 0 -%endif Summary: C++ logging library -License: LGPL-2.1 +License: LGPL-2.1-only Group: Development/Languages/C and C++ -Url: http://log4cpp.sourceforge.net/ -Source: %{name}-1.1.2rc3.tar.gz -Patch1: fix_sle11_build.patch +Url: http://%{name}.sourceforge.net/ +Source: %{name}-%{version}.tar.xz BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: fdupes %endif -%description -Log for C++ is a library of classes for flexible logging to files, syslog, -and other destinations. It is modeled after the Log for Java library and -stays as close to its API as is reasonable. +%define libname lib%{name}5 -%package -n liblog4cpp5 +%description +Log for C++ is a library of classes for flexible logging to files, syslog, and other destinations. It is modeled after the Log for Java library and stays as close to its API as is reasonable. + +%package -n %{libname} Summary: Logging for C++ Group: System/Libraries -%description -n liblog4cpp5 +%description -n %{libname} Logging facilities providing library. %package devel Summary: Development tools for Log for C++ Group: Development/Libraries/C and C++ -Requires: liblog4cpp5 = %{version} +Requires: %{libname} = %{version} %description devel The %{name}-devel package contains the static libraries and header files @@ -62,6 +55,7 @@ needed for development with %{name}. %package doc Summary: HTML formatted API documention for Log for C++ Group: Documentation/HTML +BuildArch: noarch %description doc The %{name}-doc package contains HTML formatted API documention generated by @@ -69,40 +63,39 @@ the popular doxygen documentation generation tool. %prep %setup -q -n %{name} -%patch1 -p1 %build %configure --enable-doxygen --disable-static -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} mandir=%{buildroot}/%{_mandir} docdir=%{buildroot}/%{_docdir}/%{name} +%{__make} %{?_smp_mflags} install DESTDIR=%{buildroot} mandir=%{buildroot}%{_mandir} docdir=%{buildroot}%{_docdir}/%{name} find %{buildroot} -type f -name "*.la" -delete -print %if 0%{?suse_version} %fdupes -s %{buildroot}/%{_docdir}/%{name}/api %endif -%post -n liblog4cpp5 -p /sbin/ldconfig -%postun -n liblog4cpp5 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%files -n liblog4cpp5 -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS README THANKS ChangeLog -%{_libdir}/liblog4cpp.so.5 -%{_libdir}/liblog4cpp.so.5.0.6 +%files -n %{libname} +%defattr(-,root,root,-) +%{_libdir}/*.so.* %files devel %defattr(-,root,root) -%{_includedir}/log4cpp -%{_mandir}/man*/* -%{_bindir}/log4cpp-config -%{_libdir}/liblog4cpp.so -%{_libdir}/pkgconfig/log4cpp.pc +%{_includedir}/%{name} +%{_mandir}/man3/%{name}*.3%{?ext_man} +%{_bindir}/%{name}-config +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc %dir %{_datadir}/aclocal -%attr(644,root,root) %{_datadir}/aclocal/log4cpp.m4 +%attr(644,root,root) %{_datadir}/aclocal/%{name}.m4 %files doc %defattr(-,root,root) +%doc AUTHORS ChangeLog NEWS README THANKS %doc %{_docdir}/%{name} +%license COPYING %changelog From 827a1f3f1fd0181ae04e9f56d5f808bb7b4e55059cf456b1b464ef9c4cd030fb Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 21 Dec 2018 04:58:09 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/log4cpp?expand=0&rev=11 --- log4cpp.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/log4cpp.changes b/log4cpp.changes index efb8552..562b50a 100644 --- a/log4cpp.changes +++ b/log4cpp.changes @@ -3,6 +3,7 @@ Wed Dec 19 19:46:01 UTC 2018 - marec@detebe.org - update to version 1.1.3 * no upstream changelog +- drop fix_sle11_build.patch, no longer needed ------------------------------------------------------------------- Mon Oct 10 15:33:28 UTC 2016 - adam.majer@suse.de