Accepting request 820766 from home:elimat:branches:devel:libraries:c_c++

- Version update to 1.15.1
  Portability:
  * Fix Wdefaulted-function-deleted warning with clang
  * Remove old Visual Studio project files
- Changes in version 1.15.0
  * Report (un)signed character as intergers
  * add CPPUNIT_TEST_FIXTURE()
  * add message_to_string trait to allow custom string formatters
  Portability:
  * Fix build with gcc 9
  * Fix various compiler warnings
- Run spec-cleaner
  * remove rpm groups
- Drop patches fixed upstream:
  * gcc9-Wdeprecated-copy-1.patch
  * gcc9-Wdeprecated-copy-2.patch

OBS-URL: https://build.opensuse.org/request/show/820766
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cppunit?expand=0&rev=17

baselibs.conf

@@ -1,4 +1,4 @@
-libcppunit-1_14-0
+libcppunit-1_15-1
 cppunit-devel
   requires -libcppunit-<targettype>
-  requires "libcppunit-1_14-0-<targettype> = <version>"
+  requires "libcppunit-1_15-1-<targettype> = <version>"

cppunit-1.14.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780
-size 959716

cppunit.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Jul 13 22:22:05 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
+
+- Version update to 1.15.1
+  Portability:
+  * Fix Wdefaulted-function-deleted warning with clang
+  * Remove old Visual Studio project files
+- Changes in version 1.15.0
+  * Report (un)signed character as intergers
+  * add CPPUNIT_TEST_FIXTURE()
+  * add message_to_string trait to allow custom string formatters
+  Portability:
+  * Fix build with gcc 9
+  * Fix various compiler warnings
+- Run spec-cleaner
+  * remove rpm groups
+- Drop patches fixed upstream:
+  * gcc9-Wdeprecated-copy-1.patch
+  * gcc9-Wdeprecated-copy-2.patch
+
 -------------------------------------------------------------------
 Mon Apr 29 14:11:16 UTC 2019 - Martin Liška <mliska@suse.cz>
 

cppunit.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cppunit
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,22 @@
 #
 
 
-%define libname libcppunit-1_14-0
+%define libname libcppunit-1_15-1
 Name:           cppunit
-Version:        1.14.0
+Version:        1.15.1
 Release:        0
 Summary:        C++ Port of the JUnit Testing Framework
 License:        LGPL-2.1-or-later
-Group:          Development/Libraries/C and C++
+URL:            https://www.freedesktop.org/wiki/Software/cppunit
-Url:            http://www.freedesktop.org/wiki/Software/cppunit
 Source:         http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz
 Source1:        cppunit-devel.desktop
 Source99:       baselibs.conf
-Patch0:         gcc9-Wdeprecated-copy-1.patch
-Patch1:         gcc9-Wdeprecated-copy-2.patch
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  graphviz
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 CppUnit is the C++ port of the famous JUnit framework for unit testing.
@@ -44,14 +40,12 @@ supervised tests.
 
 %package -n %{libname}
 Summary:        Cppunit library for writting C++ unittests
-Group:          System/Libraries
 
 %description -n %{libname}
 Cppunit library for writting C++ unittests in JUnit like fashion.
 
 %package devel
 Summary:        Include Files and Libraries for cppunit
-Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
 Suggests:       devel-doc = %{version}
 Provides:       libcppunit-devel = %{version}
@@ -63,7 +57,6 @@ in JUnit like fashion.
 
 %package devel-doc
 Summary:        Documentation for the cppunit API
-Group:          Documentation/HTML
 Conflicts:      libcppunit-devel < 1.13.2
 BuildArch:      noarch
 
@@ -71,9 +64,7 @@ BuildArch:      noarch
 This package contains documentation for the cppunit API.
 
 %prep
-%setup -q
+%autosetup
-%patch0 -p1
-%patch1 -p1
 
 %build
 export CXXFLAGS="%{optflags}"
@@ -82,12 +73,14 @@ export CXXFLAGS="%{optflags}"
     --disable-silent-rules \
     --disable-static \
     --enable-doxygen
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 # remove la archive
 find %{buildroot} -type f -name "*.la" -delete -print
+# remove INSTALL* files from package docs
+find %{buildroot}%{_docdir}/%{name}/ -type f -name "INSTALL*" -delete -print
 # this got also installed to _defaultdocdir
 rm -rf %{buildroot}%{_datadir}/cppunit/html/
 find %{buildroot}%{_includedir} -type f | xargs chmod a-x
@@ -97,19 +90,18 @@ install %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
 %suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/cppunit-devel.desktop
 
 %check
-make check %{?_smp_mflags}
+%make_build check
 
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig
 
 %files -n %{libname}
-%defattr(-,root,root)
+%license COPYING
-%doc AUTHORS COPYING
+%doc AUTHORS
 %{_libdir}/libcppunit*.so.*
 %{_datadir}/cppunit
 
 %files devel
-%defattr(-,root,root)
 %doc NEWS README THANKS ChangeLog
 %dir %{_docdir}/%{name}
 %{_docdir}/%{name}/*
@@ -119,7 +111,6 @@ make check %{?_smp_mflags}
 %{_includedir}/*
 
 %files devel-doc
-%defattr(-,root,root)
 %doc doc/html/*
 %{_datadir}/susehelp
 

gcc9-Wdeprecated-copy-1.patch

@@ -1,41 +0,0 @@
-From 4f5cd3b486afb9c7be1903252b4ae3787137a454 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 7 Aug 2018 16:24:49 +0200
-Subject: [PATCH] Avoid GCC 9 -Wdeprecated-copy
-
-...when an implicitly-defined copy function is used that may in a future C++
-standard be defined as deleted because of the user-declared destructor.  Just
-declare all the four copy/move functions as defaulted for a consistent
-interface.
-
-(Originally addressed with LibreOffice commit
-<https://gerrit.libreoffice.org/58042> "external/cppunit: silence
--Werror=deprecated-copy (GCC trunk towards GCC 9)".)
-
-Change-Id: Ie38ac3a613e6fbc2e4045cb5b14c3f6d167c79c5
-Reviewed-on: https://gerrit.libreoffice.org/58690
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-Tested-by: Stephan Bergmann <sbergman@redhat.com>
----
- include/cppunit/extensions/TestSuiteBuilderContext.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/include/cppunit/extensions/TestSuiteBuilderContext.h b/include/cppunit/extensions/TestSuiteBuilderContext.h
-index 72bfa70..12d157e 100644
---- a/include/cppunit/extensions/TestSuiteBuilderContext.h
-+++ b/include/cppunit/extensions/TestSuiteBuilderContext.h
-@@ -40,6 +40,11 @@ public:
- 
-   virtual ~TestSuiteBuilderContextBase();
- 
-+  TestSuiteBuilderContextBase(TestSuiteBuilderContextBase const &) = default;
-+  TestSuiteBuilderContextBase(TestSuiteBuilderContextBase &&) = default;
-+  TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase const &) = default;
-+  TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase &&) = default;
-+
-   /*! \brief Adds a test to the fixture suite.
-    *
-    * \param test Test to add to the fixture suite. Must not be \c NULL.
--- 
-2.21.0
-

gcc9-Wdeprecated-copy-2.patch

@@ -1,50 +0,0 @@
-From 78e64f0edb4f3271a6ddbcdf9cba05138597bfca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Li=C5=A1ka?= <mliska@suse.cz>
-Date: Tue, 30 Apr 2019 10:44:44 +0200
-Subject: [PATCH] Fix build with gcc9.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I8a0d7a0b51b5c537dbcfa8fdd34e816605b1f32e
-Reviewed-on: https://gerrit.libreoffice.org/71573
-Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz>
-Tested-by: Tomáš Chvátal <tchvatal@suse.cz>
----
- examples/cppunittest/OrthodoxTest.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/examples/cppunittest/OrthodoxTest.h b/examples/cppunittest/OrthodoxTest.h
-index 8fc2a08..a2bc678 100644
---- a/examples/cppunittest/OrthodoxTest.h
-+++ b/examples/cppunittest/OrthodoxTest.h
-@@ -38,6 +38,8 @@ private:
-   public:
-     Value( int value =0 ) : m_value( value ) {}
- 
-+    Value( const Value & ) = default;
-+
-     Value& operator= ( const Value& v )
-     {
-       m_value = v.m_value;
-@@ -143,6 +145,8 @@ private:
-     {
-       return ValueBadCall( -1 - m_value );
-     }
-+
-+    ValueBadCall &operator =( const ValueBadCall & ) = default;
-   };
- 
- 
-@@ -161,6 +165,8 @@ private:
-       ++m_value;
-       return *this;
-     }
-+
-+    ValueBadAssignment( const ValueBadAssignment & ) = default;
-   };
- 
- 
--- 
-2.21.0
-