peter pushed to gmock (epel7). "Initial update to 1.6.0 but requires script update."
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Mar 26 14:48:19 UTC 2015
>From a507f0aa1b39a1fbebf994384570e98f1d2e510d Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair at redhat.com>
Date: Mon, 29 Jul 2013 16:04:41 -0500
Subject: Initial update to 1.6.0 but requires script update.
diff --git a/.gitignore b/.gitignore
index c130e5a..0c09e0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/gmock-1.5.0.tar.bz2
+/gmock-1.6.0.zip
diff --git a/gmock.spec b/gmock.spec
index 0edf268..1bdaf03 100644
--- a/gmock.spec
+++ b/gmock.spec
@@ -1,18 +1,19 @@
Summary: Google C++ Mocking Framework
Name: gmock
-Version: 1.5.0
-Release: 4%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://code.google.com/p/googlemock/
-Source0: http://googlemock.googlecode.com/files/gmock-%{version}.tar.bz2
+Source0: gmock-1.6.0.zip
+Patch0: install.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: gtest-devel >= 1.5.0
+BuildRequires: gtest-devel >= 1.6.0
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: python
-Requires: gtest >= 1.5.0
+Requires: gtest >= 1.6.0
%description
Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s
@@ -39,29 +40,22 @@ This package contains development files for %{name}.
%prep
%setup -q
-# Only acx_pthread.m4 needed from gtest,
-# save the rest for use in make check
-mv gtest gtest.rpmbuild
-install -D -p -m 0644 gtest.rpmbuild/m4/acx_pthread.m4 \
- gtest/m4/acx_pthread.m4
+%patch0 -p1
%build
# needed for mahe check to work without failures
autoreconf -fvi
-%configure --disable-static
-# Omit unused direct shared library dependencies and rpaths
-sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool
+%configure
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install INSTALL="%{__install} -p" DESTDIR=%{buildroot}
-find %{buildroot} -type f -name "*.la" -delete
+
+# we *DO NOT* distribute the libraries
+rm -rf %{buildroot}/%{_libdir}
%check
-# restore gtest for make check to work
-rm -rf gtest
-mv gtest.rpmbuild gtest
make check
%clean
@@ -74,18 +68,20 @@ rm -rf %{buildroot}
%files
%defattr(-, root, root, -)
%doc CHANGES CONTRIBUTORS COPYING README
-%{_libdir}/libgmock.so.*
-%{_libdir}/libgmock_main.so.*
%files devel
%defattr(-, root, root, -)
-%{_bindir}/gmock-config
-%{_bindir}/gmock_doctor.py
-%{_libdir}/libgmock.so
-%{_libdir}/libgmock_main.so
-%{_includedir}/gmock
+#%{_bindir}/gmock-config
+#%{_bindir}/gmock_doctor.py
+%{_includedir}/../src/%{name}/
+%{_includedir}/%{name}/
+%{_datadir}/pkgconfig/*
+
%changelog
+* Mon Jul 29 2013 Timothy St. Clair <tstclair at redhat.com> - 1.6.0-1
+- Update to 1.6.0 release
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/install.patch b/install.patch
new file mode 100644
index 0000000..53ca61b
--- /dev/null
+++ b/install.patch
@@ -0,0 +1,75 @@
+diff --git a/Makefile.am b/Makefile.am
+index adc21d7..35b1a99 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,6 +25,20 @@ 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 = \
++ src/gmock-all.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
+ # 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-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
+diff --git a/configure.ac b/configure.ac
+index e8b65bd..9ec7743 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@ AC_PREREQ([2.59])
+ AC_CONFIG_SRCDIR([./COPYING])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_HEADERS([build-aux/config.h])
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile gmock.pc])
+ AC_CONFIG_FILES([scripts/gmock-config], [chmod +x scripts/gmock-config])
+
+ # Initialize Automake with various options. We require at least v1.9, prevent
+diff --git a/gmock.pc.in b/gmock.pc.in
+new file mode 100644
+index 0000000..da4b6c4
+--- /dev/null
++++ b/gmock.pc.in
+@@ -0,0 +1,14 @@
++#############################
++# Pkg-Config file for gmock #
++#############################
++
++Name: gmock
++Description: Google C++ mocking framework
++URL: https://code.google.com/p/googlemock/
++Version: @VERSION@
++
++prefix=@prefix@
++includedir=@includedir@
++srcdir=@prefix@/src/gmock
++
++Cflags: -I${includedir}/gmock
diff --git a/sources b/sources
index 06dcc72..6e5b0c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d738cfee341ad10ce0d7a0cc4209dd5e gmock-1.5.0.tar.bz2
+f547f47321ca88d3965ca2efdcc2a3c1 gmock-1.6.0.zip
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gmock.git/commit/?h=epel7&id=a507f0aa1b39a1fbebf994384570e98f1d2e510d
More information about the scm-commits
mailing list