peter pushed to gmock (epel7). "1.7.0"

[notifications at fedoraproject.org]

>From 01525ecf8690375b4946c1b8194c4ce71a297e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terje.rosten at ntnu.no>
Date: Wed, 23 Jul 2014 12:11:23 +0200
Subject: 1.7.0


diff --git a/.gitignore b/.gitignore
index 0c09e0b..38a7214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gmock-1.5.0.tar.bz2
 /gmock-1.6.0.zip
+/gmock-1.7.0.zip
diff --git a/gmock.spec b/gmock.spec
index 92f29bf..e81285c 100644
--- a/gmock.spec
+++ b/gmock.spec
@@ -1,20 +1,19 @@
 Summary:        Google C++ Mocking Framework
 Name:           gmock
-Version:        1.6.0
-Release:        3%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://code.google.com/p/googlemock/
-Source0:        gmock-1.6.0.zip
+Source0:        https://googlemock.googlecode.com/files/gmock-%{version}.zip
 Patch0:         install.patch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
-BuildRequires:  gtest-devel >= 1.6.0
+BuildRequires:  gtest-devel >= 1.7.0
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  python
-Requires:       gtest >= 1.6.0
+Requires:       gtest >= 1.7.0
 
 %description
 Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s
@@ -44,31 +43,25 @@ This package contains development files for %{name}.
 %patch0 -p1
 
 %build
-# needed for mahe check to work without failures
+# needed for make check to work without failures
 autoreconf -fvi     
 %configure
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make install INSTALL="%{__install} -p" DESTDIR=%{buildroot}
 
 %check
 make check
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
-%doc CHANGES CONTRIBUTORS COPYING README
+%doc CHANGES CONTRIBUTORS LICENSE README
 
 %files devel
-%defattr(-, root, root, -)
 %{_bindir}/gmock-config
 %{_includedir}/../src/%{name}/
 %{_includedir}/%{name}/
@@ -76,6 +69,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/generator/
 
 %changelog
+* Wed Jul 23 2014 Terje Rosten <terje.rosten at ntnu.no> - 1.7.0-1
+- 1.7.0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/install.patch b/install.patch
index 8a16d16..9d83d41 100644
--- a/install.patch
+++ b/install.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile.am b/Makefile.am
-index adc21d7..2077654 100644
+index 0eb7bd8..ca6c6fd 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -7,6 +7,9 @@ EXTRA_DIST =
+@@ -7,6 +7,9 @@ EXTRA_DIST = LICENSE
  # included in the 'subdirs' variable.
  SUBDIRS = $(subdirs)
  
@@ -28,7 +28,7 @@ index adc21d7..2077654 100644
  pkginclude_HEADERS = \
    include/gmock/gmock-actions.h \
    include/gmock/gmock-cardinalities.h \
-@@ -43,7 +49,7 @@ pkginclude_internal_HEADERS = \
+@@ -44,7 +50,7 @@ pkginclude_internal_HEADERS = \
    include/gmock/internal/gmock-internal-utils.h \
    include/gmock/internal/gmock-port.h
  
@@ -37,7 +37,7 @@ index adc21d7..2077654 100644
  lib_libgmock_main_la_LIBADD = lib/libgmock.la
  
  # Build rules for tests. Automake's naming for some of these variables isn't
-@@ -178,8 +184,8 @@ $(test_gmock_fused_test_SOURCES): fused-gmock-internal
+@@ -184,8 +190,8 @@ $(test_gmock_fused_test_SOURCES): fused-gmock-internal
  
  # TODO(vladl at google.com): Find a way to add Google Tests's sources here.
  fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
@@ -48,7 +48,7 @@ index adc21d7..2077654 100644
                        scripts/fuse_gmock_files.py
  	mkdir -p "$(srcdir)/fused-src"
  	chmod -R u+w "$(srcdir)/fused-src"
-@@ -200,10 +206,8 @@ CLEANFILES = core
+@@ -207,10 +213,8 @@ CLEANFILES = core
  # Mock can lead to undefined behavior due to violation of the
  # One-Definition Rule.
  
@@ -65,11 +65,11 @@ index adc21d7..2077654 100644
 +	cp -f src/* $(DESTDIR)$(prefix)/src/@PACKAGE@
 +	sed -i s/src[/]//g $(DESTDIR)$(prefix)/src/@PACKAGE@/gmock-all.cc
 diff --git a/configure.ac b/configure.ac
-index e8b65bd..9ec7743 100644
+index d268d5d..9d23176 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -10,7 +10,7 @@ AC_PREREQ([2.59])
- AC_CONFIG_SRCDIR([./COPYING])
+ AC_CONFIG_SRCDIR([./LICENSE])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_HEADERS([build-aux/config.h])
 -AC_CONFIG_FILES([Makefile])
diff --git a/sources b/sources
index 6e5b0c0..b95df87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f547f47321ca88d3965ca2efdcc2a3c1  gmock-1.6.0.zip
+073b984d8798ea1594f5e44d85b20d66  gmock-1.7.0.zip
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gmock.git/commit/?h=epel7&id=01525ecf8690375b4946c1b8194c4ce71a297e6e