orion pushed to protobuf (f22). "Revert to 2.5.0 for f22"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 01:11:45 UTC 2015
From 01de9c8289adeafd02314f94c560516e895fdea5 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Tue, 19 May 2015 19:11:38 -0600
Subject: Revert to 2.5.0 for f22
diff --git a/0001-Add-generic-GCC-support-for-atomic-operations.patch b/0001-Add-generic-GCC-support-for-atomic-operations.patch
new file mode 100644
index 0000000..171695f
--- /dev/null
+++ b/0001-Add-generic-GCC-support-for-atomic-operations.patch
@@ -0,0 +1,209 @@
+From d099ec11fc8c2eb97df2bf2fbb6996066eefca46 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Thu, 2 May 2013 10:43:47 +0200
+Subject: [PATCH] Add generic GCC support for atomic operations
+
+This is useful for architectures where no specialized code has been
+written.
+---
+ src/google/protobuf/stubs/atomicops.h | 2 +-
+ .../stubs/atomicops_internals_generic_gcc.h | 139 +++++++++++++++++++++
+ src/google/protobuf/stubs/platform_macros.h | 14 ++-
+ 3 files changed, 153 insertions(+), 2 deletions(-)
+ create mode 100644 src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
+
+diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h
+index b8581fa..883b125 100644
+--- a/src/google/protobuf/stubs/atomicops.h
++++ b/src/google/protobuf/stubs/atomicops.h
+@@ -185,7 +185,7 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR
+ #elif defined(__pnacl__)
+ #include <google/protobuf/stubs/atomicops_internals_pnacl.h>
+ #else
+-GOOGLE_PROTOBUF_ATOMICOPS_ERROR
++#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
+ #endif
+
+ // Unknown.
+diff --git a/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
+new file mode 100644
+index 0000000..3fc2a9b
+--- /dev/null
++++ b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
+@@ -0,0 +1,139 @@
++// Protocol Buffers - Google's data interchange format
++// Copyright 2013 Red Hat Inc. All rights reserved.
++// http://code.google.com/p/protobuf/
++//
++// Redistribution and use in source and binary forms, with or without
++// modification, are permitted provided that the following conditions are
++// met:
++//
++// * Redistributions of source code must retain the above copyright
++// notice, this list of conditions and the following disclaimer.
++// * Redistributions in binary form must reproduce the above
++// copyright notice, this list of conditions and the following disclaimer
++// in the documentation and/or other materials provided with the
++// distribution.
++// * Neither the name of Red Hat Inc. nor the names of its
++// contributors may be used to endorse or promote products derived from
++// this software without specific prior written permission.
++//
++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++// This file is an internal atomic implementation, use atomicops.h instead.
++
++#ifndef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_GCC_H_
++#define GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_GCC_H_
++
++namespace google {
++namespace protobuf {
++namespace internal {
++
++inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
++ Atomic32 old_value,
++ Atomic32 new_value) {
++ __atomic_compare_exchange_n(ptr, &old_value, new_value, true,
++ __ATOMIC_RELAXED, __ATOMIC_RELAXED);
++ return old_value;
++}
++
++inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
++ Atomic32 new_value) {
++ return __atomic_exchange_n(ptr, new_value, __ATOMIC_RELAXED);
++}
++
++inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
++ Atomic32 increment) {
++ return __atomic_add_fetch(ptr, increment, __ATOMIC_RELAXED);
++}
++
++inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
++ Atomic32 increment) {
++ return __atomic_add_fetch(ptr, increment, __ATOMIC_SEQ_CST);
++}
++
++inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
++ Atomic32 old_value,
++ Atomic32 new_value) {
++ __atomic_compare_exchange(ptr, &old_value, &new_value, true,
++ __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE);
++ return old_value;
++}
++
++inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
++ Atomic32 old_value,
++ Atomic32 new_value) {
++ __atomic_compare_exchange_n(ptr, &old_value, new_value, true,
++ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
++ return old_value;
++}
++
++inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
++ __atomic_store_n(ptr, value, __ATOMIC_RELAXED);
++}
++
++inline void MemoryBarrier() {
++ __sync_synchronize();
++}
++
++inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
++ __atomic_store_n(ptr, value, __ATOMIC_ACQUIRE);
++}
++
++inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
++ __atomic_store_n(ptr, value, __ATOMIC_RELEASE);
++}
++
++inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
++ return __atomic_load_n(ptr, __ATOMIC_RELAXED);
++}
++
++inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
++ return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
++}
++
++inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
++ return __atomic_load_n(ptr, __ATOMIC_RELEASE);
++}
++
++#ifdef __LP64__
++
++inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
++ __atomic_store_n(ptr, value, __ATOMIC_RELEASE);
++}
++
++inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
++ return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
++}
++
++inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
++ Atomic64 old_value,
++ Atomic64 new_value) {
++ __atomic_compare_exchange_n(ptr, &old_value, new_value, true,
++ __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE);
++ return old_value;
++}
++
++inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
++ Atomic64 old_value,
++ Atomic64 new_value) {
++ __atomic_compare_exchange_n(ptr, &old_value, new_value, true,
++ __ATOMIC_RELAXED, __ATOMIC_RELAXED);
++ return old_value;
++}
++
++#endif // defined(__LP64__)
++
++} // namespace internal
++} // namespace protobuf
++} // namespace google
++
++#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_GCC_H_
+diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h
+index b1df60e..db691d8 100644
+--- a/src/google/protobuf/stubs/platform_macros.h
++++ b/src/google/protobuf/stubs/platform_macros.h
+@@ -43,6 +43,9 @@
+ #elif defined(_M_IX86) || defined(__i386__)
+ #define GOOGLE_PROTOBUF_ARCH_IA32 1
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
++#elif defined(__aarch64__)
++#define GOOGLE_PROTOBUF_ARCH_AARCH64 1
++#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
+ #elif defined(__QNX__)
+ #define GOOGLE_PROTOBUF_ARCH_ARM_QNX 1
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
+@@ -54,9 +57,18 @@
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
+ #elif defined(__pnacl__)
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
+-#elif defined(__ppc__)
++#elif defined(__ppc64__) || defined(__PPC64__)
++#define GOOGLE_PROTOBUF_ARCH_PPC64 1
++#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
++#elif defined(__ppc__) || defined(__PPC__)
+ #define GOOGLE_PROTOBUF_ARCH_PPC 1
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
++#elif defined(__s390x__)
++#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
++#define GOOGLE_PROTOBUF_ARCH_S390X 1
++#elif defined(__s390__)
++#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
++#define GOOGLE_PROTOBUF_ARCH_S390 1
+ #else
+ #error Host architecture was not detected as supported by protobuf
+ #endif
+--
+1.8.1.4
+
diff --git a/protobuf-2.5.0-java-fixes.patch b/protobuf-2.5.0-java-fixes.patch
new file mode 100644
index 0000000..9952627
--- /dev/null
+++ b/protobuf-2.5.0-java-fixes.patch
@@ -0,0 +1,201 @@
+--- protobuf-2.5.0/java/pom.xml.orig 2013-02-26 09:58:21.000000000 -0800
++++ protobuf-2.5.0/java/pom.xml 2013-03-09 19:16:29.581904896 -0800
+@@ -1,152 +1,79 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+- <parent>
+- <groupId>com.google</groupId>
+- <artifactId>google</artifactId>
+- <version>1</version>
+- </parent>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.5.0</version>
+ <packaging>bundle</packaging>
+ <name>Protocol Buffer Java API</name>
+ <description>
+ Protocol Buffers are a way of encoding structured data in an efficient yet
+ extensible format.
+ </description>
+ <inceptionYear>2008</inceptionYear>
+ <url>http://code.google.com/p/protobuf</url>
+ <licenses>
+ <license>
+ <name>New BSD license</name>
+ <url>http://www.opensource.org/licenses/bsd-license.php</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://code.google.com/p/protobuf/source/browse</url>
+ <connection>
+ scm:svn:http://protobuf.googlecode.com/svn/trunk/
+ </connection>
+ </scm>
+- <dependencies>
+- <dependency>
+- <groupId>junit</groupId>
+- <artifactId>junit</artifactId>
+- <version>4.4</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.easymock</groupId>
+- <artifactId>easymock</artifactId>
+- <version>2.2</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.easymock</groupId>
+- <artifactId>easymockclassextension</artifactId>
+- <version>2.2.1</version>
+- <scope>test</scope>
+- </dependency>
+- </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+- <artifactId>maven-surefire-plugin</artifactId>
+- <configuration>
+- <includes>
+- <include>**/*Test.java</include>
+- </includes>
+- </configuration>
+- </plugin>
+- <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="target/generated-sources" />
+ <exec executable="../src/protoc">
+ <arg value="--java_out=target/generated-sources" />
+ <arg value="--proto_path=../src" />
+ <arg value="../src/google/protobuf/descriptor.proto" />
+ </exec>
+ </tasks>
+ <sourceRoot>target/generated-sources</sourceRoot>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+- <execution>
+- <id>generate-test-sources</id>
+- <phase>generate-test-sources</phase>
+- <configuration>
+- <tasks>
+- <mkdir dir="target/generated-test-sources" />
+- <exec executable="../src/protoc">
+- <arg value="--java_out=target/generated-test-sources" />
+- <arg value="--proto_path=../src" />
+- <arg value="--proto_path=src/test/java" />
+- <arg value="../src/google/protobuf/unittest.proto" />
+- <arg value="../src/google/protobuf/unittest_import.proto" />
+- <arg value="../src/google/protobuf/unittest_import_public.proto" />
+- <arg value="../src/google/protobuf/unittest_mset.proto" />
+- <arg
+- value="src/test/java/com/google/protobuf/multiple_files_test.proto" />
+- <arg value="src/test/java/com/google/protobuf/nested_builders_test.proto" />
+- <arg value="src/test/java/com/google/protobuf/nested_extension.proto" />
+- <arg value="src/test/java/com/google/protobuf/nested_extension_lite.proto" />
+- <arg value="src/test/java/com/google/protobuf/non_nested_extension.proto" />
+- <arg value="src/test/java/com/google/protobuf/non_nested_extension_lite.proto" />
+- <arg value="src/test/java/com/google/protobuf/test_bad_identifiers.proto" />
+- <arg
+- value="../src/google/protobuf/unittest_optimize_for.proto" />
+- <arg
+- value="../src/google/protobuf/unittest_custom_options.proto" />
+- <arg value="../src/google/protobuf/unittest_lite.proto" />
+- <arg value="../src/google/protobuf/unittest_import_lite.proto" />
+- <arg value="../src/google/protobuf/unittest_import_public_lite.proto" />
+- <arg value="../src/google/protobuf/unittest_lite_imports_nonlite.proto" />
+- <arg value="../src/google/protobuf/unittest_enormous_descriptor.proto" />
+- <arg value="../src/google/protobuf/unittest_no_generic_services.proto" />
+- </exec>
+- </tasks>
+- <testSourceRoot>target/generated-test-sources</testSourceRoot>
+- </configuration>
+- <goals>
+- <goal>run</goal>
+- </goals>
+- </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>lite</id>
+ <build>
+ <plugins>
+ <plugin>
+@@ -161,45 +88,33 @@
+ <include>**/FieldSet.java</include>
+ <include>**/GeneratedMessageLite.java</include>
+ <include>**/Internal.java</include>
+ <include>**/InvalidProtocolBufferException.java</include>
+ <include>**/LazyStringArrayList.java</include>
+ <include>**/LazyStringList.java</include>
+ <include>**/MessageLite.java</include>
+ <include>**/MessageLiteOrBuilder.java</include>
+ <include>**/SmallSortedMap.java</include>
+ <include>**/UninitializedMessageException.java</include>
+ <include>**/UnmodifiableLazyStringList.java</include>
+ <include>**/WireFormat.java</include>
+ <include>**/Parser.java</include>
+ <include>**/AbstractParser.java</include>
+ <include>**/BoundedByteString.java</include>
+ <include>**/LiteralByteString.java</include>
+ <include>**/RopeByteString.java</include>
+ <include>**/Utf8.java</include>
+ <include>**/LazyField.java</include>
+ </includes>
+- <testIncludes>
+- <testInclude>**/LiteTest.java</testInclude>
+- <testInclude>**/*Lite.java</testInclude>
+- </testIncludes>
+- </configuration>
+- </plugin>
+- <plugin>
+- <artifactId>maven-surefire-plugin</artifactId>
+- <configuration>
+- <includes>
+- <include>**/LiteTest.java</include>
+- </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <classifier>lite</classifier>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ </project>
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-2.6.0-java-fixes.patch b/protobuf-2.6.0-java-fixes.patch
deleted file mode 100644
index b116235..0000000
--- a/protobuf-2.6.0-java-fixes.patch
+++ /dev/null
@@ -1,209 +0,0 @@
---- protobuf-2.6.0/java/pom.xml.orig 2014-08-25 15:52:36.000000000 -0400
-+++ protobuf-2.6.0/java/pom.xml 2014-11-06 13:12:04.459524614 -0500
-@@ -1,160 +1,79 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-- <parent>
-- <groupId>com.google</groupId>
-- <artifactId>google</artifactId>
-- <version>1</version>
-- </parent>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.6.0</version>
- <packaging>bundle</packaging>
- <name>Protocol Buffer Java API</name>
- <description>
- Protocol Buffers are a way of encoding structured data in an efficient yet
- extensible format.
- </description>
- <inceptionYear>2008</inceptionYear>
- <url>http://code.google.com/p/protobuf</url>
- <licenses>
- <license>
- <name>New BSD license</name>
- <url>http://www.opensource.org/licenses/bsd-license.php</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <url>http://code.google.com/p/protobuf/source/browse</url>
- <connection>
- scm:svn:http://protobuf.googlecode.com/svn/trunk/
- </connection>
- </scm>
-- <dependencies>
-- <dependency>
-- <groupId>junit</groupId>
-- <artifactId>junit</artifactId>
-- <version>4.4</version>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymock</artifactId>
-- <version>2.2</version>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymockclassextension</artifactId>
-- <version>2.2.1</version>
-- <scope>test</scope>
-- </dependency>
-- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
-- <artifactId>maven-surefire-plugin</artifactId>
-- <configuration>
-- <includes>
-- <include>**/*Test.java</include>
-- </includes>
-- </configuration>
-- </plugin>
-- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <mkdir dir="target/generated-sources" />
- <exec executable="../src/protoc">
- <arg value="--java_out=target/generated-sources" />
- <arg value="--proto_path=../src" />
- <arg value="../src/google/protobuf/descriptor.proto" />
- </exec>
- </tasks>
- <sourceRoot>target/generated-sources</sourceRoot>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-- <execution>
-- <id>generate-test-sources</id>
-- <phase>generate-test-sources</phase>
-- <configuration>
-- <tasks>
-- <mkdir dir="target/generated-test-sources" />
-- <exec executable="../src/protoc">
-- <arg value="--java_out=target/generated-test-sources" />
-- <arg value="--proto_path=../src" />
-- <arg value="--proto_path=src/test/java" />
-- <arg value="../src/google/protobuf/unittest.proto" />
-- <arg value="../src/google/protobuf/unittest_import.proto" />
-- <arg value="../src/google/protobuf/unittest_import_public.proto" />
-- <arg value="../src/google/protobuf/unittest_mset.proto" />
-- <arg value="src/test/java/com/google/protobuf/lazy_fields_lite.proto" />
-- <arg value="src/test/java/com/google/protobuf/lite_equals_and_hash.proto" />
-- <arg
-- value="src/test/java/com/google/protobuf/multiple_files_test.proto" />
-- <arg value="src/test/java/com/google/protobuf/nested_builders_test.proto" />
-- <arg value="src/test/java/com/google/protobuf/nested_extension.proto" />
-- <arg value="src/test/java/com/google/protobuf/nested_extension_lite.proto" />
-- <arg value="src/test/java/com/google/protobuf/non_nested_extension.proto" />
-- <arg value="src/test/java/com/google/protobuf/non_nested_extension_lite.proto" />
-- <arg value="src/test/java/com/google/protobuf/outer_class_name_test.proto" />
-- <arg value="src/test/java/com/google/protobuf/outer_class_name_test2.proto" />
-- <arg value="src/test/java/com/google/protobuf/outer_class_name_test3.proto" />
-- <arg value="src/test/java/com/google/protobuf/test_bad_identifiers.proto" />
-- <arg value="src/test/java/com/google/protobuf/test_check_utf8.proto" />
-- <arg value="src/test/java/com/google/protobuf/test_check_utf8_size.proto" />
-- <arg value="src/test/java/com/google/protobuf/test_custom_options.proto" />
-- <arg
-- value="../src/google/protobuf/unittest_optimize_for.proto" />
-- <arg
-- value="../src/google/protobuf/unittest_custom_options.proto" />
-- <arg value="../src/google/protobuf/unittest_lite.proto" />
-- <arg value="../src/google/protobuf/unittest_import_lite.proto" />
-- <arg value="../src/google/protobuf/unittest_import_public_lite.proto" />
-- <arg value="../src/google/protobuf/unittest_lite_imports_nonlite.proto" />
-- <arg value="../src/google/protobuf/unittest_enormous_descriptor.proto" />
-- <arg value="../src/google/protobuf/unittest_no_generic_services.proto" />
-- </exec>
-- </tasks>
-- <testSourceRoot>target/generated-test-sources</testSourceRoot>
-- </configuration>
-- <goals>
-- <goal>run</goal>
-- </goals>
-- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>http://code.google.com/p/protobuf</Bundle-DocURL>
- <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
- <Export-Package>com.google.protobuf;version=2.5.0</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>lite</id>
- <build>
-@@ -173,45 +92,33 @@
- <include>**/Internal.java</include>
- <include>**/InvalidProtocolBufferException.java</include>
- <include>**/LazyStringArrayList.java</include>
- <include>**/LazyStringList.java</include>
- <include>**/MessageLite.java</include>
- <include>**/MessageLiteOrBuilder.java</include>
- <include>**/SmallSortedMap.java</include>
- <include>**/UninitializedMessageException.java</include>
- <include>**/UnmodifiableLazyStringList.java</include>
- <include>**/WireFormat.java</include>
- <include>**/Parser.java</include>
- <include>**/AbstractParser.java</include>
- <include>**/BoundedByteString.java</include>
- <include>**/LiteralByteString.java</include>
- <include>**/RopeByteString.java</include>
- <include>**/Utf8.java</include>
- <include>**/LazyField.java</include>
- <include>**/LazyFieldLite.java</include>
- <include>**/ProtocolStringList.java</include>
- </includes>
-- <testIncludes>
-- <testInclude>**/LiteTest.java</testInclude>
-- <testInclude>**/*Lite.java</testInclude>
-- </testIncludes>
-- </configuration>
-- </plugin>
-- <plugin>
-- <artifactId>maven-surefire-plugin</artifactId>
-- <configuration>
-- <includes>
-- <include>**/LiteTest.java</include>
-- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classifier>lite</classifier>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- </project>
diff --git a/protobuf.spec b/protobuf.spec
index c939a20..a39966e 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -15,18 +15,20 @@
Summary: Protocol Buffers - Google's data interchange format
Name: protobuf
-Version: 2.6.0
-Release: 2%{?dist}
+Version: 2.5.0
+Release: 11%{?dist}
License: BSD
Group: Development/Libraries
Source: http://protobuf.googlecode.com/files/protobuf-%{version}.tar.bz2
Source1: ftdetect-proto.vim
Source2: protobuf-init.el
Patch1: protobuf-2.5.0-fedora-gtest.patch
-Patch2: protobuf-2.6.0-java-fixes.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(bin)
+BuildRequires: emacs
BuildRequires: emacs-el >= 24.1
%if %{with gtest}
BuildRequires: gtest-devel
@@ -59,7 +61,6 @@ Summary: Protocol Buffers C++ headers and libraries
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-compiler = %{version}-%{release}
-Requires: zlib-devel
Requires: pkgconfig
%description devel
@@ -188,6 +189,9 @@ chmod 644 examples/*
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
mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
@@ -324,16 +328,6 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
%endif
%changelog
-* Wed Dec 17 2014 Peter Lemenkov <lemenkov at gmail.com> - 2.6.0-2
-- Added missing Requires zlib-devel to protobuf-devel (see rhbz #1173343). See
- also rhbz #732087.
-
-* Sun Oct 19 2014 Conrad Meyer <cemeyer at uw.edu> - 2.6.0-1
-- Bump to upstream release 2.6.0 (rh# 1154474).
-- Rebase 'java fixes' patch on 2.6.0 pom.xml.
-- Drop patch #3 (fall back to generic GCC atomics if no specialized atomics
- exist, e.g. AArch64 GCC); this has been upstreamed.
-
* Sun Oct 19 2014 Conrad Meyer <cemeyer at uw.edu> - 2.5.0-11
- protobuf-emacs requires emacs(bin), not emacs (rh# 1154456)
diff --git a/sources b/sources
index 928a5ea..cf25af4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78253c509a055dab316a21e754cb278a protobuf-2.6.0.tar.bz2
+a72001a9067a4c2c4e0e836d0f92ece4 protobuf-2.5.0.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/protobuf.git/commit/?h=f22&id=01de9c8289adeafd02314f94c560516e895fdea5
More information about the scm-commits
mailing list