- added version patch: clean up versioning mess; release 2

diff --git a/gtest-version.patch b/gtest-version.patch
new file mode 100644 (file)
index 0000000..d8ac615
--- /dev/null
+++ b/gtest-version.patch
@@ -0,0 +1,42 @@
+--- googletest-release-1.8.1/configure.ac.orig 2018-08-31 17:21:57.000000000 +0200
++++ googletest-release-1.8.1/configure.ac      2018-10-16 16:34:16.015945823 +0200
+@@ -1,5 +1,5 @@
+ AC_INIT([Google C++ Mocking and Testing Frameworks],
+-        [1.8.0],
++        [1.8.1],
+         [googlemock@googlegroups.com],
+         [googletest])
+ 
+--- googletest-release-1.8.1/CMakeLists.txt.orig       2018-08-31 17:21:57.000000000 +0200
++++ googletest-release-1.8.1/CMakeLists.txt    2018-10-16 16:34:29.929279000 +0200
+@@ -5,7 +5,7 @@
+ endif (POLICY CMP0048)
+ 
+ project(googletest-distribution)
+-set(GOOGLETEST_VERSION 1.9.0)
++set(GOOGLETEST_VERSION 1.8.1)
+ 
+ enable_testing()
+ 
+--- googletest-release-1.8.1/googletest/configure.ac.orig      2018-08-31 17:21:57.000000000 +0200
++++ googletest-release-1.8.1/googletest/configure.ac   2018-10-16 16:32:10.055947264 +0200
+@@ -5,7 +5,7 @@
+ # "[1.0.1]"). It also asumes that there won't be any closing parenthesis
+ # between "AC_INIT(" and the closing ")" including comments and strings.
+ AC_INIT([Google C++ Testing Framework],
+-        [1.8.0],
++        [1.8.1],
+         [googletestframework@googlegroups.com],
+         [gtest])
+ 
+--- googletest-release-1.8.1/googlemock/configure.ac.orig      2018-10-16 16:29:59.762615418 +0200
++++ googletest-release-1.8.1/googlemock/configure.ac   2018-10-16 16:34:39.462612224 +0200
+@@ -1,7 +1,7 @@
+ m4_include(../googletest/m4/acx_pthread.m4)
+ 
+ AC_INIT([Google C++ Mocking Framework],
+-        [1.8.0],
++        [1.8.1],
+         [googlemock@googlegroups.com],
+         [gmock])
+ 

diff --git a/gtest.spec b/gtest.spec
index f7a41084aba82ced0f5faefb1a8e4de0e304873e..66883817f972d301e4c8d7fa7bc137d99cff48cb 100644 (file)
--- a/gtest.spec
+++ b/gtest.spec
@@ -6,7 +6,7 @@ Summary:        Google C++ testing framework
 Summary(pl.UTF-8):     Szkielet testów w C++ stworzony przez Google
 Name:          gtest
 Version:       1.8.1
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Tools
 #Source0Download: https://github.com/google/googletest/releases
@@ -15,6 +15,7 @@ Source0:      https://github.com/google/googletest/archive/release-%{version}/%{name}
 Patch0:                %{name}-install.patch
 Patch1:                %{name}-link.patch
 Patch2:                gmock-install.patch
+Patch3:                %{name}-version.patch
 URL:           https://github.com/google/googletest
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
@@ -106,6 +107,7 @@ Google Mock:
 
 %prep
 %setup -q -n googletest-release-%{version}
+%patch3 -p1
 
 cd googletest
 %patch0 -p1