pool/googletest
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 649910 from M17N

Browse Source 
- Remove errant backslahes from description.
- Rewrite summaries without em dashes.
- 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/649910
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/googletest?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2018-11-20 21:27:32 +00:00 committed by Git OBS Bridge
commit 1d5a1b669d
5 changed files with 42 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
googletest-fix-cmake-libdir-install.patch
View File

@ -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)

3
googletest-release-1.8.0.tar.gz
View File

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

3
googletest-release-1.8.1.tar.gz Normal file
View File

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

21
googletest.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Nov 17 09:01:09 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Remove errant backslahes from description.
- Rewrite summaries without em dashes.
-------------------------------------------------------------------
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

39
googletest.spec
View File

@ -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
@ -12,32 +12,28 @@
# 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/
#
%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
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,
@ -45,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}
@ -53,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,
@ -64,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
@ -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