- package cmake support file, adjusted sources packaging accordingly

- release 2

diff --git a/gmock.spec b/gmock.spec
index 7a676b071cb9b8c5e2df9c3a8bd1c26fae85094d..2f887518237fd3fb7e561e0e1cd405f3429065d4 100644 (file)
--- a/gmock.spec
+++ b/gmock.spec
@@ -2,7 +2,7 @@ Summary:        Google C++ Mocking Framework
 Summary(pl.UTF-8):     Szkielet Google Mock dla C++
 Name:          gmock
 Version:       1.7.0
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Libraries
 #Source0Download: http://code.google.com/p/googlemock/downloads/list
@@ -52,7 +52,7 @@ Google Mock:
 Summary:       Google C++ Mocking Framework
 Summary(pl.UTF-8):     Szkielet Google Mock dla C++
 Group:         Development/Libraries
-Requires:      gtest-devel >= 1.7.0
+Requires:      gtest-devel >= 1.7.0-2
 Requires:      libstdc++-devel
 Provides:      %{name} = %{version}-%{release}
 Obsoletes:     gmock < 1.6.0-3

diff --git a/install.patch b/install.patch
index 8a16d1647f81454ec320ecbd412d979b1348283c..9b92535471babe384bfc357ea8248125d3c89e1c 100644 (file)
--- a/install.patch
+++ b/install.patch
@@ -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
+@@ -200,10 +206,9 @@ CLEANFILES = core
  # Mock can lead to undefined behavior due to violation of the
  # One-Definition Rule.
  
@@ -60,10 +60,11 @@ index adc21d7..2077654 100644
 -      echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
 -      false
 +install-exec-hook:
-+      mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@ $(DESTDIR)$(prefix)/src/@PACKAGE@
++      mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@ $(DESTDIR)$(prefix)/src/@PACKAGE@/src
 +      cp -rf scripts/generator $(DESTDIR)$(datadir)/@PACKAGE@
-+      cp -f src/* $(DESTDIR)$(prefix)/src/@PACKAGE@
-+      sed -i s/src[/]//g $(DESTDIR)$(prefix)/src/@PACKAGE@/gmock-all.cc
++      cp -f src/* $(DESTDIR)$(prefix)/src/@PACKAGE@/src
++      cp -f CMakeLists.txt $(DESTDIR)$(prefix)/src/@PACKAGE@
++      sed -i s/src[/]//g $(DESTDIR)$(prefix)/src/@PACKAGE@/src/gmock-all.cc
 diff --git a/configure.ac b/configure.ac
 index e8b65bd..9ec7743 100644
 --- a/configure.ac