[protobuf] Bump to upstream release 2.6.0 (rh# 1154474).
konradm
konradm at fedoraproject.org
Thu Nov 6 18:22:06 UTC 2014
commit bcb7feb017b8f97010a7f1a3c5fb5c6c8959847d
Author: Conrad Meyer <cse.cem at gmail.com>
Date: Thu Nov 6 13:20:38 2014 -0500
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.
.gitignore | 1 +
...generic-GCC-support-for-atomic-operations.patch | 209 --------------------
protobuf-2.5.0-makefile.patch | 30 ---
...-fixes.patch => protobuf-2.6.0-java-fixes.patch | 28 ++-
protobuf.spec | 19 +-
sources | 2 +-
6 files changed, 30 insertions(+), 259 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b61dc84..db06dd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
protobuf-2.3.0.tar.bz2
/protobuf-2.4.1.tar.bz2
/protobuf-2.5.0.tar.bz2
+/protobuf-2.6.0.tar.bz2
diff --git a/protobuf-2.5.0-java-fixes.patch b/protobuf-2.6.0-java-fixes.patch
similarity index 85%
rename from protobuf-2.5.0-java-fixes.patch
rename to protobuf-2.6.0-java-fixes.patch
index 9952627..b116235 100644
--- a/protobuf-2.5.0-java-fixes.patch
+++ b/protobuf-2.6.0-java-fixes.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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"
@@ -13,7 +13,7 @@
- </parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0</version>
<packaging>bundle</packaging>
<name>Protocol Buffer Java API</name>
<description>
@@ -107,6 +107,8 @@
- <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" />
@@ -114,7 +116,13 @@
- <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
@@ -141,7 +149,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>*</Export-Package>
+ <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>
@@ -151,11 +161,7 @@
<profile>
<id>lite</id>
<build>
- <plugins>
- <plugin>
-@@ -161,45 +88,33 @@
- <include>**/FieldSet.java</include>
- <include>**/GeneratedMessageLite.java</include>
+@@ -173,45 +92,33 @@
<include>**/Internal.java</include>
<include>**/InvalidProtocolBufferException.java</include>
<include>**/LazyStringArrayList.java</include>
@@ -173,6 +179,8 @@
<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>
diff --git a/protobuf.spec b/protobuf.spec
index a39966e..693f6c0 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -15,20 +15,18 @@
Summary: Protocol Buffers - Google's data interchange format
Name: protobuf
-Version: 2.5.0
-Release: 11%{?dist}
+Version: 2.6.0
+Release: 1%{?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.5.0-java-fixes.patch
-Patch3: 0001-Add-generic-GCC-support-for-atomic-operations.patch
-Patch4: protobuf-2.5.0-makefile.patch
+Patch2: protobuf-2.6.0-java-fixes.patch
URL: http://code.google.com/p/protobuf/
BuildRequires: automake autoconf libtool pkgconfig zlib-devel
-BuildRequires: emacs
+BuildRequires: emacs(bin)
BuildRequires: emacs-el >= 24.1
%if %{with gtest}
BuildRequires: gtest-devel
@@ -189,9 +187,6 @@ 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
@@ -328,6 +323,12 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
%endif
%changelog
+* Sun Oct 19 2014 Conrad Meyer <cemeyer at uw.edu> - 2.6.0-1
+- Bump to upstream release 2.6.0.
+- 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 cf25af4..928a5ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a72001a9067a4c2c4e0e836d0f92ece4 protobuf-2.5.0.tar.bz2
+78253c509a055dab316a21e754cb278a protobuf-2.6.0.tar.bz2
More information about the scm-commits
mailing list