1.7.0

.gitignore

@@ -1,3 +1,4 @@
 gtest-1.4.0.tar.bz2
 /gtest-1.5.0.tar.bz2
 /gtest-1.6.0.zip
+/gtest-1.7.0.zip

gtest.spec

@@ -1,14 +1,15 @@
 Summary:        Google C++ testing framework
 Name:           gtest
-Version:        1.6.0
-Release:        5%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 License:        BSD
 Group:          Development/Tools
 URL:            http://code.google.com/p/googletest/
 Source0:        http://googletest.googlecode.com/files/gtest-%{version}.zip
 Patch0:         gtest-soname.patch
-BuildRequires:  python cmake libtool
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires:  cmake
+BuildRequires:  libtool
+BuildRequires:  python
 
 %description
 Google's framework for writing C++ tests on a variety of platforms
@@ -32,22 +33,24 @@ This package contains development files for %{name}.
 %patch0 -p1 -b .0-soname
 
 # keep a clean copy of samples.
-cp -pr ./samples ./samples.orig
+cp -a ./samples ./samples.orig
 
 %build
 # this is odd but needed only to generate gtest-config.
 %configure
 mkdir build
 pushd build
-%cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_BUILD_RPATH=TRUE -DPYTHON_EXECUTABLE=%{__python} -Dgtest_build_tests=ON ..
+%cmake -DBUILD_SHARED_LIBS=ON \
+       -DCMAKE_SKIP_BUILD_RPATH=TRUE \
+       -DPYTHON_EXECUTABLE=%{__python2} \
+       -Dgtest_build_tests=ON \
+       ..
 popd
-
 make %{?_smp_mflags} -C build
 
 %check
 # LD_LIBRARY_PATH needed due to cmake_skip_rpath in %%build
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/build \
-make test -C build
+LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/build make test -C build
 
 # Restore the clean copy of samples.
 # To be later listed against doc.
@@ -55,37 +58,31 @@ rm -rf ./samples
 mv ./samples.orig ./samples
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # make install doesn't work anymore.
 # need to install them manually.
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/aclocal,%{_includedir}/gtest{,/internal},%{_libdir}}
+install -d %{buildroot}{%{_includedir}/gtest{,/internal},%{_libdir}}
 # just for backward compatibility
-install -p -m 0755 build/libgtest.so.*.* build/libgtest_main.so.*.* $RPM_BUILD_ROOT%{_libdir}/
-(cd $RPM_BUILD_ROOT%{_libdir};
-ln -sf libgtest.so.*.* $RPM_BUILD_ROOT%{_libdir}/libgtest.so
-ln -sf libgtest_main.so.*.* $RPM_BUILD_ROOT%{_libdir}/libgtest_main.so
+install -p -m 0755 build/libgtest.so.*.* build/libgtest_main.so.*.* %{buildroot}%{_libdir}/
+(cd %{buildroot}%{_libdir};
+ln -sf libgtest.so.*.* %{buildroot}%{_libdir}/libgtest.so
+ln -sf libgtest_main.so.*.* %{buildroot}%{_libdir}/libgtest_main.so
 )
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-install -p -m 0755 scripts/gtest-config $RPM_BUILD_ROOT%{_bindir}
-install -p -m 0644 include/gtest/*.h $RPM_BUILD_ROOT%{_includedir}/gtest/
-install -p -m 0644 include/gtest/internal/*.h $RPM_BUILD_ROOT%{_includedir}/gtest/internal/
-install -p -m 0644 m4/gtest.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+/sbin/ldconfig -n %{buildroot}%{_libdir}
+install -D -p -m 0755 scripts/gtest-config %{buildroot}%{_bindir}/gtest-config
+install -p -m 0644 include/gtest/*.h %{buildroot}%{_includedir}/gtest/
+install -p -m 0644 include/gtest/internal/*.h %{buildroot}%{_includedir}/gtest/internal/
+install -D -p -m 0644 m4/gtest.m4 %{buildroot}%{_datadir}/aclocal/gtest.m4
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
-%doc CHANGES CONTRIBUTORS COPYING README
+%doc CHANGES CONTRIBUTORS LICENSE README
 %{_libdir}/libgtest.so.*
 %{_libdir}/libgtest_main.so.*
 
 %files devel
-%defattr(-, root, root, -)
 %doc samples
 %{_bindir}/gtest-config
 %{_datadir}/aclocal/gtest.m4
@@ -94,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gtest
 
 %changelog
+* Tue Jul 22 2014 Terje Rosten <terje.rosten@ntnu.no> - 1.7.0-1
+- 1.7.0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 - 1.5.0
 - some cleanup
 
-* Sat Aug 26 2010 Dan Horák <dan[at]danny.cz> - 1.4.0-2
+* Thu Aug 26 2010 Dan Horák <dan[at]danny.cz> - 1.4.0-2
 - added workaround for linking the tests on Fedora >= 13 (#564953, #599865)
 
 * Sat Nov 14 2009 Debarshi Ray <rishi@fedoraproject.org> - 1.4.0-1

sources

@@ -1 +1 @@
-4577b49f2973c90bf9ba69aa8166b786  gtest-1.6.0.zip
+2d6ec8ccdf5c46b05ba54a9fd1d130d7  gtest-1.7.0.zip