Author: qboosh Date: Thu Jun 16 13:30:27 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.6.0 - pl - added install patch to restore install target, link patch to fix linking with libpthread - unfedorized (build static libs, package .la as there is no pkg-config support)
---- Files affected: packages/gtest: gtest.spec (1.4 -> 1.5) , gtest-install.patch (NONE -> 1.1) (NEW), gtest-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gtest/gtest.spec diff -u packages/gtest/gtest.spec:1.4 packages/gtest/gtest.spec:1.5 --- packages/gtest/gtest.spec:1.4 Sat May 15 00:54:31 2010 +++ packages/gtest/gtest.spec Thu Jun 16 15:30:22 2011 @@ -1,26 +1,28 @@ # $Revision$, $Date$ -# TODO -# - libgtest.so needs -lpthread -# - tests fail due some linkage problems # # Conditional build: -%bcond_with tests # build without tests. - +%bcond_without tests # do not perform "make check" +# Summary: Google C++ testing framework +Summary(pl.UTF-8): Szkielet testów w C++ stworzony przez Google Name: gtest -Version: 1.5.0 +Version: 1.6.0 Release: 1 License: BSD Group: Development/Tools +#Source0Download: http://code.google.com/p/googletest/downloads/list +Source0: http://googletest.googlecode.com/files/%{name}-%{version}.zip +# Source0-md5: 4577b49f2973c90bf9ba69aa8166b786 +Patch0: %{name}-install.patch +Patch1: %{name}-link.patch URL: http://code.google.com/p/googletest/ -Source0: http://googletest.googlecode.com/files/%{name}-%{version}.tar.bz2 -# Source0-md5: 8b2c3c3f26cb53e64a3109d03a97200a -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: autoconf >= 2.59 +BuildRequires: automake >= 1:1.9 BuildRequires: libstdc++-devel -BuildRequires: libtool -BuildRequires: python -BuildRequires: python-modules +BuildRequires: libtool >= 2:1.5 +BuildRequires: python >= 2.3 +BuildRequires: python-modules >= 2.3 +BuildRequires: unzip BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -31,39 +33,68 @@ failures, various options for running the tests, and XML test report generation. +%description -l pl.UTF-8 +Stworzony przez Google szkielet do pisania testów w C++ na różnych +platformach (GNU/Linux, Mac OS X, Windows, Windows CE, Symbian). Jest +oparty na architekturze xUnit. Obsługuje automatyczne wykrywanie +testów, bogaty zbiór zapewnień, zapewnienia zdefiniowane przez +użytkownika, testy śmierci, niepowodzenia krytyczne i niekrytyczne, +różne opcje uruchamiania testów oraz tworzenie raportów z testów w +XML-u. + %package devel -Summary: Development files for %{name} +Summary: Development files for gtest framework +Summary(pl.UTF-8): Pliki programistyczne szkieletu gtest Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libstdc++-devel %description devel -This package contains development files for %{name}. +This package contains development files for gtest framework. + +%description devel -l pl.UTF-8 +Ten pakiet zawiera pliki programistyczne szkieletu gtest. + +%package static +Summary: Static gtest libraries +Summary(pl.UTF-8): Statyczne biblioteki gtest +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static gtest libraries. + +%description static -l pl.UTF-8 +Statyczne biblioteki gtest. %prep %setup -q +%patch0 -p1 +%patch1 -p1 # Keep a clean copy of samples. cp -a samples examples %build +%{__libtoolize} %{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} -%{__libtoolize} -%configure \ - --disable-static +%configure %{__make} -%{?with_tests:make check} +%{?with_tests:%{__make} check} %install rm -rf $RPM_BUILD_ROOT + %{__make} install \ INSTALL="%{__install} -p" \ DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +install -Dp scripts/gtest-config $RPM_BUILD_ROOT%{_bindir}/gtest-config install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} @@ -76,7 +107,7 @@ %files %defattr(644,root,root,755) -%doc CHANGES CONTRIBUTORS README +%doc CHANGES CONTRIBUTORS COPYING README %attr(755,root,root) %{_libdir}/libgtest.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgtest.so.0 %attr(755,root,root) %{_libdir}/libgtest_main.so.*.*.* @@ -84,21 +115,32 @@ %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/%{name}-config -%{_libdir}/libgtest.so -%{_libdir}/libgtest_main.so -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/*.h -%{_includedir}/%{name}/internal -%{_aclocaldir}/%{name}.m4 +%attr(755,root,root) %{_bindir}/gtest-config +%attr(755,root,root) %{_libdir}/libgtest.so +%attr(755,root,root) %{_libdir}/libgtest_main.so +%{_libdir}/libgtest.la +%{_libdir}/libgtest_main.la +%{_includedir}/gtest +%{_aclocaldir}/gtest.m4 %{_examplesdir}/%{name}-%{version} +%files static +%defattr(644,root,root,755) +%{_libdir}/libgtest.a +%{_libdir}/libgtest_main.a + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2011/06/16 13:30:22 qboosh +- updated to 1.6.0 +- pl +- added install patch to restore install target, link patch to fix linking with libpthread +- unfedorized (build static libs, package .la as there is no pkg-config support) + Revision 1.4 2010/05/14 22:54:31 sparky - BR: autoconf, automake, libstdc++-devel, python, python-modules ================================================================ Index: packages/gtest/gtest-install.patch diff -u /dev/null packages/gtest/gtest-install.patch:1.1 --- /dev/null Thu Jun 16 15:30:27 2011 +++ packages/gtest/gtest-install.patch Thu Jun 16 15:30:22 2011 @@ -0,0 +1,18 @@ +--- gtest-1.6.0/Makefile.am.orig 2011-04-15 21:49:12.000000000 +0200 ++++ gtest-1.6.0/Makefile.am 2011-06-16 13:08:22.272743192 +0200 +@@ -288,15 +288,3 @@ + # 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 ================================================================ Index: packages/gtest/gtest-link.patch diff -u /dev/null packages/gtest/gtest-link.patch:1.1 --- /dev/null Thu Jun 16 15:30:27 2011 +++ packages/gtest/gtest-link.patch Thu Jun 16 15:30:22 2011 @@ -0,0 +1,10 @@ +--- gtest-1.6.0/Makefile.am.orig 2011-06-16 13:10:10.212746806 +0200 ++++ gtest-1.6.0/Makefile.am 2011-06-16 14:09:29.259532641 +0200 +@@ -181,6 +181,7 @@ + lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la + + lib_libgtest_la_SOURCES = src/gtest-all.cc ++lib_libgtest_la_LIBADD = -lpthread + + pkginclude_HEADERS = \ + include/gtest/gtest-death-test.h \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtest/gtest.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
