From 36d1add6e0b9cdbeb6d8a339a0ada864c32253b5d337a57ed18f24b96b52c621 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 17 Nov 2018 05:58:08 +0000 Subject: [PATCH 1/2] Accepting request 649587 from home:adamm:branches:M17N - Update to version 1.8.1: * add pkg-config files * add --no_stacktrace_support for json-output-unittest * allow macros inside of parametrized test names. * support JSON output format in addition to XML * add options to parallelize builds * fix double free when building Gtest/GMock in shared libraries and linking a test executable with both. * 2.6.4 is the minimum CMake version - cleanup spec file - googletest-fix-cmake-libdir-install.patch: dropped, upstreamed OBS-URL: https://build.opensuse.org/request/show/649587 OBS-URL: https://build.opensuse.org/package/show/M17N/googletest?expand=0&rev=21 --- googletest-fix-cmake-libdir-install.patch | 26 -------------------- googletest-release-1.8.0.tar.gz | 3 --- googletest-release-1.8.1.tar.gz | 3 +++ googletest.changes | 15 ++++++++++++ googletest.spec | 29 ++++++++++------------- 5 files changed, 31 insertions(+), 45 deletions(-) delete mode 100644 googletest-fix-cmake-libdir-install.patch delete mode 100644 googletest-release-1.8.0.tar.gz create mode 100644 googletest-release-1.8.1.tar.gz diff --git a/googletest-fix-cmake-libdir-install.patch b/googletest-fix-cmake-libdir-install.patch deleted file mode 100644 index 2a92158..0000000 --- a/googletest-fix-cmake-libdir-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: b/googlemock/CMakeLists.txt -=================================================================== ---- a/googlemock/CMakeLists.txt -+++ b/googlemock/CMakeLists.txt -@@ -104,7 +104,7 @@ endif() - # - # Install rules - install(TARGETS gmock gmock_main -- DESTINATION lib) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock - DESTINATION include) - -Index: b/googletest/CMakeLists.txt -=================================================================== ---- a/googletest/CMakeLists.txt -+++ b/googletest/CMakeLists.txt -@@ -103,7 +103,7 @@ endif() - # - # Install rules - install(TARGETS gtest gtest_main -- DESTINATION lib) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest - DESTINATION include) - diff --git a/googletest-release-1.8.0.tar.gz b/googletest-release-1.8.0.tar.gz deleted file mode 100644 index 0801462..0000000 --- a/googletest-release-1.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 -size 1281617 diff --git a/googletest-release-1.8.1.tar.gz b/googletest-release-1.8.1.tar.gz new file mode 100644 index 0000000..ada42de --- /dev/null +++ b/googletest-release-1.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c +size 992298 diff --git a/googletest.changes b/googletest.changes index 4fb373a..9768983 100644 --- a/googletest.changes +++ b/googletest.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Nov 16 11:06:17 UTC 2018 - adam.majer@suse.de + +- Update to version 1.8.1: + * add pkg-config files + * add --no_stacktrace_support for json-output-unittest + * allow macros inside of parametrized test names. + * support JSON output format in addition to XML + * add options to parallelize builds + * fix double free when building Gtest/GMock in shared libraries + and linking a test executable with both. + * 2.6.4 is the minimum CMake version +- cleanup spec file +- googletest-fix-cmake-libdir-install.patch: dropped, upstreamed + ------------------------------------------------------------------- Sat Dec 30 00:13:00 CET 2017 - tiwai@suse.de diff --git a/googletest.spec b/googletest.spec index d385172..0b2a927 100644 --- a/googletest.spec +++ b/googletest.spec @@ -1,7 +1,7 @@ # # spec file for package googletest # -# Copyright (c) 2017 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,24 +17,20 @@ %define _name googlemock - Name: googletest -Version: 1.8.0 +Version: 1.8.1 Release: 0 Summary: Google C++ Testing Framework License: BSD-3-Clause Group: Development/Libraries/C and C++ -Url: https://github.com/google/googletest -# download URL: https://github.com/google/googletest/archive/release-%{version}.tar.gz -Source0: %{name}-release-%{version}.tar.gz +URL: https://github.com/google/googletest +Source0: https://github.com/google/googletest/archive/release-%{version}.tar.gz#/%{name}-release-%{version}.tar.gz Source1: googletest-rpmlintrc -# PATCH-FIX-UPSTREAM googletest-fix-cmake-libdir-install.patch luc14n0@linuxmail.org -- enable the use of /usr/lib(64) instead of /usr/local/lib(64). -Patch0: googletest-fix-cmake-libdir-install.patch -BuildRequires: cmake +BuildRequires: cmake >= 2.6.4 BuildRequires: gcc-c++ +BuildRequires: pkgconfig BuildRequires: python BuildRequires: pkgconfig(pthread-stubs) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Google\'s framework for writing C++ tests on a variety of platforms @@ -77,10 +73,8 @@ writing and using C++ mock classes. This package provides shared libraries and header files for development with googlemock. - %prep %setup -q -n %{name}-release-%{version} -%patch0 -p1 %build %cmake @@ -93,17 +87,20 @@ mkdir -p %{buildroot}%{_includedir}/gmock/src && install -m 0644 googlemock/src/ mkdir -p %{buildroot}%{_includedir}/gtest/src && install -m 0644 googletest/src/* %{buildroot}%{_includedir}/gtest/src %files -n gtest -%defattr(-, root, root) -%doc %{name}/CHANGES %{name}/CONTRIBUTORS %{name}/LICENSE %{name}/README.md +%license %{name}/LICENSE +%doc %{name}/CHANGES %{name}/CONTRIBUTORS %{name}/README.md %{_libdir}/libgtest.so %{_libdir}/libgtest_main.so %{_includedir}/gtest +%{_libdir}/pkgconfig/gtest*.pc %files -n gmock -%defattr(-, root, root) -%doc %{_name}/CHANGES %{_name}/CONTRIBUTORS %{_name}/LICENSE %{_name}/README.md +%license %{_name}/LICENSE +%doc %{_name}/CHANGES %{_name}/CONTRIBUTORS %{_name}/README.md %{_libdir}/libgmock.so %{_libdir}/libgmock_main.so %{_includedir}/gmock +%{_libdir}/cmake/GTest +%{_libdir}/pkgconfig/gmock*.pc %changelog From 7e96c03ce9fdf6a2b1ab907fa55051341cf265dbd8dcda748b7b4cf83c1396f1 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 17 Nov 2018 14:51:09 +0000 Subject: [PATCH 2/2] Accepting request 649891 from home:jengelh:branches:M17N - Remove errant backslahes from description. - Rewrite summaries without em dashes. OBS-URL: https://build.opensuse.org/request/show/649891 OBS-URL: https://build.opensuse.org/package/show/M17N/googletest?expand=0&rev=22 --- googletest.changes | 6 ++++++ googletest.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/googletest.changes b/googletest.changes index 9768983..2c68639 100644 --- a/googletest.changes +++ b/googletest.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 17 09:01:09 UTC 2018 - Jan Engelhardt + +- Remove errant backslahes from description. +- Rewrite summaries without em dashes. + ------------------------------------------------------------------- Fri Nov 16 11:06:17 UTC 2018 - adam.majer@suse.de diff --git a/googletest.spec b/googletest.spec index 0b2a927..af22f35 100644 --- a/googletest.spec +++ b/googletest.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -33,7 +33,7 @@ BuildRequires: python BuildRequires: pkgconfig(pthread-stubs) %description -Google\'s framework for writing C++ tests on a variety of platforms +Google's framework for writing C++ tests on a variety of platforms (Linux, Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on the xUnit architecture. Supports automatic test discovery, a rich set of assertions, user-defined assertions, death tests, @@ -41,7 +41,7 @@ fatal and non-fatal failures, value- and type-parameterized tests, various options for running the tests, and XML test report generation. %package -n gtest -Summary: Google C++ Testing Framework - Development files +Summary: Development files for the Google C++ Testing Framework Group: Development/Libraries/C and C++ Recommends: %{_name} = %{version} Obsoletes: %{name}-devel < %{version} @@ -49,7 +49,7 @@ Obsoletes: lib%{name}0 < %{version} Provides: %{name}-devel = %{version} %description -n gtest -Google\'s framework for writing C++ tests on a variety of platforms +Google's framework for writing C++ tests on a variety of platforms (Linux, Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on the xUnit architecture. Supports automatic test discovery, a rich set of assertions, user-defined assertions, death tests, @@ -60,7 +60,7 @@ This package provides shared libraries and header files for development with googletest. %package -n gmock -Summary: Google C++ Mocking Framework - Development files +Summary: Development files for the Google C++ Mocking Framework Group: Development/Libraries/C and C++ Recommends: %{name} = %{version} Provides: %{_name}-devel