peter pushed to gmock (epel7). "Update to fully build package."

[notifications at fedoraproject.org]

>From 8798e6dffae9c8bf8b57cd6d79b47e2557ab7d4d Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair at redhat.com>
Date: Tue, 30 Jul 2013 11:35:42 -0500
Subject: Update to fully build package.


diff --git a/gmock.spec b/gmock.spec
index 1bdaf03..c733e29 100644
--- a/gmock.spec
+++ b/gmock.spec
@@ -71,12 +71,11 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-, root, root, -)
-#%{_bindir}/gmock-config
-#%{_bindir}/gmock_doctor.py
+%{_bindir}/gmock-config
 %{_includedir}/../src/%{name}/
 %{_includedir}/%{name}/
 %{_datadir}/pkgconfig/*
-
+%{_datadir}/%{name}/generator/
 
 %changelog
 * Mon Jul 29 2013 Timothy St. Clair <tstclair at redhat.com> - 1.6.0-1
diff --git a/install.patch b/install.patch
index 53ca61b..fbef820 100644
--- a/install.patch
+++ b/install.patch
@@ -1,35 +1,48 @@
 diff --git a/Makefile.am b/Makefile.am
-index adc21d7..35b1a99 100644
+index adc21d7..65cfeb2 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -25,6 +25,20 @@ lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
+@@ -7,6 +7,9 @@ EXTRA_DIST =
+ # included in the 'subdirs' variable.
+ SUBDIRS = $(subdirs)
+ 
++
++bin_SCRIPTS = scripts/gmock-config
++
+ # This is generated by the configure script, so clean it for distribution.
+ DISTCLEANFILES = scripts/gmock-config
+ 
+@@ -25,6 +28,19 @@ lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
  
  lib_libgmock_la_SOURCES = src/gmock-all.cc
  
 +pkgconfigdir = $(datadir)/pkgconfig
-+
 +pkgconfig_DATA = gmock.pc
 +
-+exampledir = $(prefix)/src/@PACKAGE@
-+example_DATA = \
++gsrcsdir = $(prefix)/src/@PACKAGE@
++gsrcs_DATA = \
 +  src/gmock-all.cc \
-+  src/gmock.cc \ 
++  src/gmock.cc \
 +  src/gmock_main.cc \
 +  src/gmock-spec-builders.cc \
 +  src/gmock-cardinalities.cc \
 +  src/gmock-internal-utils.cc \
 +  src/gmock-matchers.cc
-+
++  
  pkginclude_HEADERS = \
    include/gmock/gmock-actions.h \
    include/gmock/gmock-cardinalities.h \
-@@ -200,10 +214,10 @@ CLEANFILES = core
+@@ -200,10 +216,14 @@ CLEANFILES = core
  # Mock 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 Mock into your build system."
 -	false
++install-exec-hook:
++	mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@
++	cp -rf scripts/generator $(DESTDIR)$(datadir)/@PACKAGE@
++
 +#install-exec-local:
 +#	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
 +#	false
-- 
cgit v0.10.2


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