peter pushed to gmock (epel7). "Updated the install.patch to not distribute the library"

[notifications at fedoraproject.org]

>From fdae350b61e64ac907307a3d362eeef05e24e7d1 Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair at redhat.com>
Date: Wed, 31 Jul 2013 11:37:17 -0500
Subject: Updated the install.patch to not distribute the library


diff --git a/gmock.spec b/gmock.spec
index c733e29..16b6a71 100644
--- a/gmock.spec
+++ b/gmock.spec
@@ -52,9 +52,6 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install INSTALL="%{__install} -p" DESTDIR=%{buildroot}
 
-# we *DO NOT* distribute the libraries
-rm -rf %{buildroot}/%{_libdir}
-
 %check
 make check
 
diff --git a/install.patch b/install.patch
index fbef820..b0fa7b1 100644
--- a/install.patch
+++ b/install.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile.am b/Makefile.am
-index adc21d7..65cfeb2 100644
+index adc21d7..9366a06 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -7,6 +7,9 @@ EXTRA_DIST =
@@ -12,9 +12,15 @@ index adc21d7..65cfeb2 100644
  # 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
+@@ -21,10 +24,23 @@ if HAVE_PTHREADS
+ endif
  
- lib_libgmock_la_SOURCES = src/gmock-all.cc
+ # Build rules for libraries.
+-lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
++check_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
+ 
+-lib_libgmock_la_SOURCES = src/gmock-all.cc
++nodist_lib_libgmock_la_SOURCES = src/gmock-all.cc
  
 +pkgconfigdir = $(datadir)/pkgconfig
 +pkgconfig_DATA = gmock.pc
@@ -32,27 +38,40 @@ index adc21d7..65cfeb2 100644
  pkginclude_HEADERS = \
    include/gmock/gmock-actions.h \
    include/gmock/gmock-cardinalities.h \
-@@ -200,10 +216,14 @@ CLEANFILES = core
+@@ -43,7 +59,7 @@ pkginclude_internal_HEADERS = \
+   include/gmock/internal/gmock-internal-utils.h \
+   include/gmock/internal/gmock-port.h
+ 
+-lib_libgmock_main_la_SOURCES = src/gmock_main.cc
++nodist_lib_libgmock_main_la_SOURCES = src/gmock_main.cc
+ lib_libgmock_main_la_LIBADD = lib/libgmock.la
+ 
+ # Build rules for tests. Automake's naming for some of these variables isn't
+@@ -178,8 +194,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) \
+-                      $(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \
+-                      $(lib_libgmock_main_la_SOURCES) \
++                      $(nodist_lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \
++                      $(nodist_lib_libgmock_main_la_SOURCES) \
+                       scripts/fuse_gmock_files.py
+ 	mkdir -p "$(srcdir)/fused-src"
+ 	chmod -R u+w "$(srcdir)/fused-src"
+@@ -200,10 +216,6 @@ 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
- 
+-
 -install-data-local:
 -	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
 -	false
-+#install-data-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@
 diff --git a/configure.ac b/configure.ac
 index e8b65bd..9ec7743 100644
 --- a/configure.ac
-- 
cgit v0.10.2


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