Hello community, here is the log from the commit of package googletest for openSUSE:Factory checked in at 2018-01-19 11:51:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/googletest (Old) and /work/SRC/openSUSE:Factory/.googletest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "googletest" Fri Jan 19 11:51:16 2018 rev:9 rq:560658 version:1.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/googletest/googletest.changes 2015-08-23 17:39:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.googletest.new/googletest.changes 2018-01-19 11:51:45.231765205 +0100 @@ -1,0 +2,50 @@ +Sat Dec 30 00:13:00 CET 2017 - ti...@suse.de + +- Fix the source (and put the download URL as a comment) for + matching with the actual tarball file name. + +------------------------------------------------------------------- +Sat Dec 16 18:55:22 UTC 2017 - luc1...@linuxmail.org + +- Update to version 1.8.0: + * Update the value of GTEST_DIR to reflect the googletest dir. + * Change the GTestDir marco value to reflect the new dir of + googletest. + * Read Bazel's $XML_OUTPUT_FILE environment variable + * Restructure: + - Test so each scenario is independent. + - $XML_OUTPUT_FILE logic + * Fixes: + - Error C2440 'return' in gmock_test + (gh#google/googletest#775). + - Tests that return object which implement operator bool. + - Operator precedence in GTEST_TEST_BOOLEAN_ with expressions + that implement operator bool. + - env_var_test to ignore XML_OUTPUT_FILE if already set. + - Link that's returned when running tests + (gh#google/googletest#714). +- Rework package turning it into a source package essencially, once + its original intention is to provide source files for a testing + framework, a pure development package itself. Aligning with + upstream ease our job and avoid unexpected bugs. +- Drop libgtest0 and googletest-devel subpackages bringing gtest + subpackage instead and obsoleting the previous ones, following + the above change. +- Provide googlemock together with googletest now that upstream + officially brought this project under gloogle's wings. +- Replace autoconf and automake BuildRequires by cmake and switch + configure, make and make_install macros by cmake, cmake_jobs and + cmake_install. Autotools are deprecated and cmake is recommended + by upstream. +- Drop libtool BuildRequires and autoreconf call. With the adoption + of cmake it's no longer need anymore. +- Drop googletest-enable-make-install.patch. No longer needed once + make install is not used anymore. +- Add googletest-fix-cmake-libdir-install.patch for enabling the + use of /usr/lib(64) instead of /usr/local/lib(64), once + upstream's CMakeLists doesn't provide flexibility in this regard. +- Add googletest-rpmlintrc file to filter warnings about + devel-file-in-non-devel-package, shlib-policy-missing-suffix and + obsolete-not-provided as the package is a devel one itself now. + +------------------------------------------------------------------- Old: ---- googletest-enable-make-install.patch release-1.7.0.tar.gz New: ---- googletest-fix-cmake-libdir-install.patch googletest-release-1.8.0.tar.gz googletest-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ googletest.spec ++++++ --- /var/tmp/diff_new_pack.G2uOFV/_old 2018-01-19 11:51:45.819737491 +0100 +++ /var/tmp/diff_new_pack.G2uOFV/_new 2018-01-19 11:51:45.819737491 +0100 @@ -1,7 +1,7 @@ # # spec file for package googletest # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -16,23 +16,24 @@ # -%define libname libgtest0 +%define _name googlemock + Name: googletest -Version: 1.7.0 +Version: 1.8.0 Release: 0 Summary: Google C++ Testing Framework License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: https://github.com/google/googletest -Source0: https://github.com/google/googletest/archive/release-%{version}.tar.gz -#PATCH-FIX-UPSTREAM marguer...@opensuse.org Google thinks `make install` -#is dangerous, but I don't think so. -Patch0: googletest-enable-make-install.patch -BuildRequires: autoconf -BuildRequires: automake +# download URL: https://github.com/google/googletest/archive/release-%{version}.tar.gz +Source0: %{name}-release-%{version}.tar.gz +Source1: googletest-rpmlintrc +# PATCH-FIX-UPSTREAM googletest-fix-cmake-libdir-install.patch luc1...@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: gcc-c++ -BuildRequires: libtool BuildRequires: python +BuildRequires: pkgconfig(pthread-stubs) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,13 +44,15 @@ fatal and non-fatal failures, value- and type-parameterized tests, various options for running the tests, and XML test report generation. -%package -n %{libname} -Summary: Google C++ Testing Framework +%package -n gtest +Summary: Google C++ Testing Framework - Development files Group: Development/Libraries/C and C++ -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} +Recommends: %{_name} = %{version} +Obsoletes: %{name}-devel < %{version} +Obsoletes: lib%{name}0 < %{version} +Provides: %{name}-devel = %{version} -%description -n %{libname} +%description -n gtest 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, @@ -57,54 +60,50 @@ fatal and non-fatal failures, value- and type-parameterized tests, various options for running the tests, and XML test report generation. -%package devel -Summary: Development files for googletest +This package provides shared libraries and header files for development +with googletest. + +%package -n gmock +Summary: Google C++ Mocking Framework - Development files Group: Development/Libraries/C and C++ -Requires: %{libname} = %{version} +Recommends: %{name} = %{version} +Provides: %{_name}-devel + +%description -n gmock +Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s specifics in +mind, Google C++ Mocking Framework (or Google Mock for short) is a library for +writing and using C++ mock classes. + +This package provides shared libraries and header files for development +with googlemock. -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use googletest. %prep %setup -q -n %{name}-release-%{version} %patch0 -p1 %build -autoreconf -fiv -%configure \ - --enable-static=no -make %{?_smp_mflags} - -%if 0%{?suse_version} > 1310 -%check -make check %{?_smp_mflags} -%endif +%cmake +%make_jobs %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} -mkdir -p %{buildroot}%{_bindir} -install -m 755 scripts/gtest-config %{buildroot}%{_bindir} -find %{buildroot} -type f -name "*.la" -delete -print - -%post -n %{libname} -p /sbin/ldconfig - -%postun -n %{libname} -p /sbin/ldconfig +%cmake_install +# Install the source code needed by some applications +mkdir -p %{buildroot}%{_includedir}/gmock/src && install -m 0644 googlemock/src/* %{buildroot}%{_includedir}/gmock/src +mkdir -p %{buildroot}%{_includedir}/gtest/src && install -m 0644 googletest/src/* %{buildroot}%{_includedir}/gtest/src -%files -n %{libname} +%files -n gtest %defattr(-, root, root) -%doc README LICENSE CONTRIBUTORS CHANGES -%{_libdir}/libgtest.so.0 -%{_libdir}/libgtest.so.0.0.0 -%{_libdir}/libgtest_main.so.0 -%{_libdir}/libgtest_main.so.0.0.0 - -%files devel -%defattr(-, root, root) -%{_bindir}/gtest-config -%{_includedir}/gtest +%doc %{name}/CHANGES %{name}/CONTRIBUTORS %{name}/LICENSE %{name}/README.md %{_libdir}/libgtest.so %{_libdir}/libgtest_main.so -%{_datadir}/aclocal/gtest.m4 +%{_includedir}/gtest + +%files -n gmock +%defattr(-, root, root) +%doc %{_name}/CHANGES %{_name}/CONTRIBUTORS %{_name}/LICENSE %{_name}/README.md +%{_libdir}/libgmock.so +%{_libdir}/libgmock_main.so +%{_includedir}/gmock %changelog ++++++ googletest-fix-cmake-libdir-install.patch ++++++ 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) ++++++ googletest-rpmlintrc ++++++ # Since the main package is a devel package: addFilter("devel-file-in-non-devel-package") # Symlinks are intentionally not generated for the SO: addFilter("shlib-policy-missing-suffix") # The package doesn't provide any libraries anymore: addFilter("obsolete-not-provided libgoogletest0")
