Hello community, here is the log from the commit of package commoncpp2 for openSUSE:Factory checked in at 2015-08-27 08:55:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/commoncpp2 (Old) and /work/SRC/openSUSE:Factory/.commoncpp2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "commoncpp2" Changes: -------- --- /work/SRC/openSUSE:Factory/commoncpp2/commoncpp2.changes 2013-06-18 10:29:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.commoncpp2.new/commoncpp2.changes 2015-08-27 08:55:59.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Aug 13 13:45:24 UTC 2015 - [email protected] + +- Specfile cleaning only: Use original source URL, add GPG + signature, explicit autotools build dependencies, + removal of Obsolete/Provides for source package, + avoid inclusion of timestamps in documentation. + +------------------------------------------------------------------- New: ---- commoncpp2-1.8.1.tar.gz.sig commoncpp2.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ commoncpp2.spec ++++++ --- /var/tmp/diff_new_pack.OVD54X/_old 2015-08-27 08:56:00.000000000 +0200 +++ /var/tmp/diff_new_pack.OVD54X/_new 2015-08-27 08:56:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package commoncpp2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -18,27 +18,27 @@ Name: commoncpp2 %define lname libcommoncpp2-1_8-0 +Version: 1.8.1 +Release: 0 Summary: A GNU lirbary package for creating portable C++ programs License: GPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.8.1 -Release: 0 -Url: http://www.gnu.org/software/commoncpp/ +Url: https://www.gnu.org/software/commoncpp/ -Source: %{name}-%{version}.tar.gz -Patch: commoncpp2-overflow.patch -Patch1: commoncpp2-applog.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: https://ftp.gnu.org/gnu/commoncpp/%name-%version.tar.gz +Source1: https://ftp.gnu.org/gnu/commoncpp/%name-%version.tar.gz.sig +Source2: %name.keyring +Patch1: commoncpp2-overflow.patch +Patch2: commoncpp2-applog.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: zlib-devel -Provides: CommonC++ -Provides: commonc++ -Obsoletes: CommonC++ -Obsoletes: commonc++ +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Common C++ is a GNU package which offers portable "abstraction" of @@ -49,12 +49,6 @@ portable. Common C++ will support most Unix operating systems as well as Win32, in addition to GNU/Linux. - - -Authors: --------- - David Sugar <[email protected]> - %package -n %lname Summary: A GNU library package for creating portable C++ programs Group: System/Libraries @@ -70,33 +64,27 @@ libraries, threading, sockets, etc. %package devel +Summary: Files for developing CommonC++ applications +Group: Development/Libraries/C and C++ Requires: %lname = %version Requires: libstdc++-devel Requires: zlib-devel -Provides: CommonC++-devel = %{version} -Provides: commonc++-devel < %{version} -Obsoletes: CommonC++-devel = %{version} -Obsoletes: commonc++-devel < %{version} -Summary: Files for developing CommonC++ applications -Group: Development/Libraries/C and C++ +Provides: CommonC++-devel = %version +Provides: commonc++-devel < %version +Obsoletes: CommonC++-devel = %version +Obsoletes: commonc++-devel < %version %description devel This package contains include files, static libraries and some documentation for the CommonC++ package. It is needed for developing and compiling CommonC++ applications. - - -Authors: --------- - David Sugar <[email protected]> - %package doc -Requires: %{name} = %{version} -Summary: A GNU package for creating portable C++ program -Group: Development/Libraries/C and C++ -Provides: CommonC++-doc = %{version} -Obsoletes: CommonC++-doc < %{version} +Summary: Documentation for GNU commoncpp +Group: Documentation/HTML +Requires: %name = %version +Provides: CommonC++-doc = %version +Obsoletes: CommonC++-doc < %version %description doc Common C++ is a GNU package which offers portable "abstraction" of @@ -107,51 +95,46 @@ portable. Common C++ will support most Unix operating systems as well as Win32, in addition to GNU/Linux. - - -Authors: --------- - David Sugar <[email protected]> - %prep %setup -q -%patch -%patch1 +%patch -P 1 -P 2 -p1 %build -autoreconf --install --force -v +autoreconf -fiv %configure --enable-shared --disable-static --with-pic +# Do not include build date in documentation +echo "HTML_TIMESTAMP = NO" >> doc/Doxyfile # Practice has shown it does not always fly. make -j1 %install -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3 -make DESTDIR=$RPM_BUILD_ROOT install -install -d $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/html -install -m 644 doc/html/* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/html/ -install -m 644 AUTHORS COPYING COPYING.addendum NEWS README TODO ChangeLog $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -rm -f $RPM_BUILD_ROOT/usr/share/info/commoncpp2.info* -rm -f %{buildroot}%{_libdir}/libcc*.la +b="%buildroot" +mkdir -p "$b/%_mandir/man3" +make DESTDIR="$b" install %{?_smp_mflags} +install -d "$b/%_defaultdocdir/%name/html" +install -m 644 doc/html/* "$b/%_defaultdocdir/%name/html/" +install -m 644 AUTHORS COPYING COPYING.addendum NEWS README TODO ChangeLog "$b/%_defaultdocdir/%name/" +rm -f "$b/%_infodir/commoncpp2.info"* +find "$b" -type f -name "*.la" -delete -print %fdupes %buildroot/%_prefix %post -n %lname -p /sbin/ldconfig - %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root,0755) -%{_libdir}/libcc*-1.8.so.0* +%defattr(-,root,root) +%_libdir/libcc*-1.8.so.0* %files devel -%defattr(-,root,root,0755) -%{_includedir}/cc++ -%{_datadir}/aclocal/ost_check2.m4 -%{_libdir}/libcc*.so -%{_bindir}/ccgnu2-config -%{_libdir}/pkgconfig/*.pc +%defattr(-,root,root) +%_includedir/cc++ +%_datadir/aclocal/ost_check2.m4 +%_libdir/libcc*.so +%_bindir/ccgnu2-config +%_libdir/pkgconfig/*.pc %files doc -%defattr(-,root,root,0755) -%doc %{_defaultdocdir}/%{name}/ +%defattr(-,root,root) +%doc %_defaultdocdir/%name/ %changelog ++++++ commoncpp2-applog.patch ++++++ --- /var/tmp/diff_new_pack.OVD54X/_old 2015-08-27 08:56:00.000000000 +0200 +++ /var/tmp/diff_new_pack.OVD54X/_new 2015-08-27 08:56:00.000000000 +0200 @@ -1,5 +1,11 @@ ---- src/applog.cpp.orig 2012-09-07 00:06:52.116623618 +0200 -+++ src/applog.cpp 2012-09-07 00:06:56.294734349 +0200 +--- + src/applog.cpp | 125 +++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 83 insertions(+), 42 deletions(-) + +Index: commoncpp2-1.8.1/src/applog.cpp +=================================================================== +--- commoncpp2-1.8.1.orig/src/applog.cpp ++++ commoncpp2-1.8.1/src/applog.cpp @@ -38,6 +38,10 @@ #include <cc++/thread.h> #include <cc++/slog.h> @@ -11,7 +17,7 @@ #include <string> #include <iomanip> #include <iostream> -@@ -115,6 +119,7 @@ +@@ -115,6 +119,7 @@ class logger : public ost::ThreadQueue string _nomeFile; std::fstream _logfs; bool _usePipe; @@ -19,7 +25,7 @@ protected: // to dequeue log messages and write them to file if not log_directly -@@ -123,7 +128,8 @@ +@@ -123,7 +128,8 @@ class logger : public ost::ThreadQueue virtual void stopQueue(void); virtual void onTimer(void); virtual void final(void); @@ -29,7 +35,7 @@ public: logger(const char* logFileName = NULL, bool usePipe = false); virtual ~logger(); -@@ -131,6 +137,9 @@ +@@ -131,6 +137,9 @@ class logger : public ost::ThreadQueue // To change log file name void logFileName(const char* FileName, bool usePipe = false); @@ -39,7 +45,7 @@ }; -@@ -281,35 +290,14 @@ +@@ -281,35 +290,14 @@ HEXdump::HEXdump(const unsigned char *bu } // class logger @@ -78,7 +84,7 @@ } logger::~logger() -@@ -332,37 +320,73 @@ +@@ -332,37 +320,73 @@ void logger::logFileName(const char* Fil if (_logfs.is_open()) _logfs.close(); @@ -168,7 +174,7 @@ if (_logfs.is_open()) { Thread::setCancel(cancelDisabled); -@@ -370,6 +394,14 @@ +@@ -370,6 +394,14 @@ void logger::runQueue(void * data) _logfs.flush(); Thread::setCancel(cancelImmediate); } @@ -183,7 +189,7 @@ } void logger::startQueue() -@@ -541,7 +573,6 @@ +@@ -541,7 +573,6 @@ void AppLog::logFileName(const char* Fil #endif if (!d->_logDirectly) { @@ -191,7 +197,7 @@ if (d->_pLogger) d->_pLogger->logFileName(FileName, d->_logPipe); else -@@ -724,6 +755,11 @@ +@@ -724,6 +755,11 @@ void AppLog::close(void) } d->_lock.leaveMutex(); } @@ -203,7 +209,7 @@ } void AppLog::open(const char *ident) -@@ -756,6 +792,11 @@ +@@ -756,6 +792,11 @@ void AppLog::open(const char *ident) } d->_lock.leaveMutex(); } ++++++ commoncpp2-overflow.patch ++++++ --- /var/tmp/diff_new_pack.OVD54X/_old 2015-08-27 08:56:00.000000000 +0200 +++ /var/tmp/diff_new_pack.OVD54X/_new 2015-08-27 08:56:00.000000000 +0200 @@ -1,6 +1,12 @@ ---- src/inaddr.cpp.orig 2012-09-06 23:45:58.295527284 +0200 -+++ src/inaddr.cpp 2012-09-06 23:47:06.148311928 +0200 -@@ -333,7 +333,7 @@ +--- + src/inaddr.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: commoncpp2-1.8.1/src/inaddr.cpp +=================================================================== +--- commoncpp2-1.8.1.orig/src/inaddr.cpp ++++ commoncpp2-1.8.1/src/inaddr.cpp +@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char if(ipaddr) delete[] ipaddr; ipaddr = new struct in_addr[1];
