[protobuf] export the new generic atomics header (rh #926374)

[Dan Horák]

commit 02e62a06ba360e14a5ca86830199963690786411
Author: Dan Horák <dan at danny.cz>
Date:   Thu May 16 11:16:08 2013 +0200

    export the new generic atomics header (rh #926374)

 protobuf-2.5.0-makefile.patch |   30 ++++++++++++++++++++++++++++++
 protobuf.spec                 |    7 ++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/protobuf-2.5.0-makefile.patch b/protobuf-2.5.0-makefile.patch
new file mode 100644
index 0000000..626ad1e
--- /dev/null
+++ b/protobuf-2.5.0-makefile.patch
@@ -0,0 +1,30 @@
+diff -up protobuf-2.5.0/src/Makefile.am.generic protobuf-2.5.0/src/Makefile.am
+--- protobuf-2.5.0/src/Makefile.am.generic	2013-05-16 10:25:07.000000000 +0200
++++ protobuf-2.5.0/src/Makefile.am	2013-05-16 10:26:15.000000000 +0200
+@@ -42,6 +42,7 @@ nobase_include_HEADERS =
+   google/protobuf/stubs/atomicops_internals_arm_gcc.h           \
+   google/protobuf/stubs/atomicops_internals_arm_qnx.h           \
+   google/protobuf/stubs/atomicops_internals_atomicword_compat.h \
++  google/protobuf/stubs/atomicops_internals_generic_gcc.h       \
+   google/protobuf/stubs/atomicops_internals_macosx.h            \
+   google/protobuf/stubs/atomicops_internals_mips_gcc.h          \
+   google/protobuf/stubs/atomicops_internals_pnacl.h             \
+diff -up protobuf-2.5.0/src/Makefile.in.generic protobuf-2.5.0/src/Makefile.in
+--- protobuf-2.5.0/src/Makefile.in.generic	2013-05-16 10:25:14.000000000 +0200
++++ protobuf-2.5.0/src/Makefile.in	2013-05-16 10:27:00.000000000 +0200
+@@ -309,6 +309,7 @@ am__nobase_include_HEADERS_DIST = google
+ 	google/protobuf/stubs/atomicops_internals_arm_gcc.h \
+ 	google/protobuf/stubs/atomicops_internals_arm_qnx.h \
+ 	google/protobuf/stubs/atomicops_internals_atomicword_compat.h \
++	google/protobuf/stubs/atomicops_internals_generic_gcc.h \
+ 	google/protobuf/stubs/atomicops_internals_macosx.h \
+ 	google/protobuf/stubs/atomicops_internals_mips_gcc.h \
+ 	google/protobuf/stubs/atomicops_internals_pnacl.h \
+@@ -518,6 +519,7 @@ nobase_include_HEADERS = \
+   google/protobuf/stubs/atomicops_internals_arm_gcc.h           \
+   google/protobuf/stubs/atomicops_internals_arm_qnx.h           \
+   google/protobuf/stubs/atomicops_internals_atomicword_compat.h \
++  google/protobuf/stubs/atomicops_internals_generic_gcc.h       \
+   google/protobuf/stubs/atomicops_internals_macosx.h            \
+   google/protobuf/stubs/atomicops_internals_mips_gcc.h          \
+   google/protobuf/stubs/atomicops_internals_pnacl.h             \
diff --git a/protobuf.spec b/protobuf.spec
index bde01fc..226018e 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -16,7 +16,7 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        2.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/protobuf-%{version}.tar.bz2
@@ -25,6 +25,7 @@ Source2:        protobuf-init.el
 Patch1:         protobuf-2.5.0-fedora-gtest.patch
 Patch2:    	    protobuf-2.5.0-java-fixes.patch
 Patch3:         0001-Add-generic-GCC-support-for-atomic-operations.patch
+Patch4:         protobuf-2.5.0-makefile.patch
 URL:            http://code.google.com/p/protobuf/
 BuildRequires:  automake autoconf libtool pkgconfig zlib-devel
 BuildRequires:  emacs
@@ -199,6 +200,7 @@ rm -rf java/src/test
 %endif
 
 %patch3 -p1 -b .generic-atomics
+%patch4 -p1 -b .generic-atomics-makefile
 
 %build
 iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
@@ -347,6 +349,9 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
 %endif
 
 %changelog
+* Thu May 16 2013 Dan Horák <dan[at]danny.cz> - 2.5.0-4
+- export the new generic atomics header (rh #926374)
+
 * Mon May 6 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.5.0-3
 - Add support for generic gcc atomic operations (rh #926374)