Hello community, here is the log from the commit of package googletest for openSUSE:Factory checked in at 2014-07-11 06:45:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/googletest (Old) and /work/SRC/openSUSE:Factory/.googletest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "googletest" Changes: -------- --- /work/SRC/openSUSE:Factory/googletest/googletest.changes 2013-11-12 15:04:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.googletest.new/googletest.changes 2014-07-11 06:45:50.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jul 6 06:27:04 UTC 2014 - [email protected] + +- add patch: googletest-enable-make-install.patch + * use standard procedure to install googletest. +- add scripts/gtest-config to installation + * used by many programs to find gtest CFLAGS and etc. +- install shared libraries for sles too + +------------------------------------------------------------------- New: ---- googletest-enable-make-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ googletest.spec ++++++ --- /var/tmp/diff_new_pack.HJpzD7/_old 2014-07-11 06:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.HJpzD7/_new 2014-07-11 06:45:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package googletest # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,12 +16,6 @@ # -%if 0%{?sles_version} -%define build_shlib 0 -%else -%define build_shlib 1 -%endif - Name: googletest Version: 1.7.0 Release: 0 @@ -30,8 +24,12 @@ Group: Development/Libraries/C and C++ Url: http://code.google.com/p/googletest/ Source0: gtest-%{version}.zip +#PATCH-FIX-UPSTREAM [email protected] Google thinks `make install` +#is dangerous, but I don't think so. +Patch: googletest-enable-make-install.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: python BuildRequires: unzip BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,49 +53,36 @@ %prep %setup -q -n gtest-%{version} +%patch -p1 +autoreconf -fi %build -mkdir build -cd build -cmake -DLIB_INSTALL_DIR=%{_libdir} ../ -%if %build_shlib -cmake -DLIB_INSTALL_DIR=%{_libdir} -Dgtest_build_tests=ON -DBUILD_SHARED_LIBS=ON -Dgtest_force_shared_crt=ON ../ -%endif +%configure --disable-static make %{?_smp_mflags} -cd .. %install -install -m 755 -d %{buildroot}%{_libdir}/ -%if %build_shlib -install -m 644 build/libgtest.so* %{buildroot}%{_libdir}/ -install -m 644 build/libgtest_main.so* %{buildroot}%{_libdir}/ -%else -install -m 644 build/libgtest.a %{buildroot}%{_libdir}/ -install -m 644 build/libgtest_main.a %{buildroot}%{_libdir}/ -%endif -install -m 755 -d %{buildroot}%{_includedir}/gtest/internal -install -m 644 include/gtest/*.h %{buildroot}%{_includedir}/gtest/ -install -m 644 include/gtest/internal/*.h %{buildroot}%{_includedir}/gtest/internal/ +%makeinstall +mkdir -p %{buildroot}%{_bindir} +install -m 755 scripts/gtest-config %{buildroot}%{_bindir} +find %{buildroot}%{_libdir} -name "*.la" -type f -delete -print -%if %build_shlib %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%endif %files %defattr(-, root, root) %doc README LICENSE CONTRIBUTORS CHANGES -%if %build_shlib -%{_libdir}/libgtest.so -%{_libdir}/libgtest_main.so -%endif +%{_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 -%if %build_shlib -%else -%{_libdir}/libgtest*.a -%endif +%{_libdir}/libgtest.so +%{_libdir}/libgtest_main.so +%{_datadir}/aclocal/gtest.m4 %changelog ++++++ googletest-enable-make-install.patch ++++++ Index: gtest-1.7.0/Makefile.am =================================================================== --- gtest-1.7.0.orig/Makefile.am +++ gtest-1.7.0/Makefile.am @@ -292,15 +292,3 @@ endif # Death tests may produce core dumps in the build directory. In case # this happens, clean them to keep distcleancheck happy. CLEANFILES = core - -# Disables 'make install' as installing a compiled version of Google -# Test can lead to undefined behavior due to violation of the -# One-Definition Rule. - -install-exec-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." - false - -install-data-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." - false -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
