rpms/protobuf
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.2.0rc2

Browse Source
This commit is contained in:
Orion Poplawski 2017-01-24 08:53:18 -07:00
parent 6c52cad0ca
commit b73bdb7f39
4 changed files with 18 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ protobuf-2.3.0.tar.bz2
/protobuf-3.1.0.tar.gz
/googlemock-1.7.0.tar.gz
/googletest-1.7.0.tar.gz
/protobuf-3.2.0rc2.tar.gz

165
2327.patch
View File

@ -1,165 +0,0 @@
From eb7f3a3ad1e89ab5de0846c354bbc682e63bd837 Mon Sep 17 00:00:00 2001
From: Christopher Tubbs <ctubbsii@apache.org>
Date: Fri, 4 Nov 2016 02:11:55 -0400
Subject: [PATCH] Use latest maven-compiler-plugin (2.6.0)
* Uses build-helper-maven-plugin to add generated sources to the classpath
* Fixes an issue building with newer versions of the maven-compiler-plugin
(See https://issues.apache.org/jira/browse/MCOMPILER-240)
---
java/compatibility_tests/v2.5.0/protos/pom.xml | 2 +-
java/core/pom.xml | 33 ++++++++++++++++++++++----
java/lite/pom.xml | 32 +++++++++++++++++++++++--
java/pom.xml | 2 +-
java/util/pom.xml | 22 +++++++++++++----
5 files changed, 77 insertions(+), 14 deletions(-)
diff --git a/java/compatibility_tests/v2.5.0/protos/pom.xml b/java/compatibility_tests/v2.5.0/protos/pom.xml
index 24447bd..a22e91e 100644
--- a/java/compatibility_tests/v2.5.0/protos/pom.xml
+++ b/java/compatibility_tests/v2.5.0/protos/pom.xml
@@ -28,7 +28,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 8a83eb4..cced344 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -92,11 +92,34 @@
<!-- Add the generated sources to the build -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <generatedSourcesDirectory>${generated.sources.dir}</generatedSourcesDirectory>
- <generatedTestSourcesDirectory>${generated.testsources.dir}</generatedTestSourcesDirectory>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-generated-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${generated.sources.dir}</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-generated-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${generated.testsources.dir}</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<!-- OSGI bundle configuration -->
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index 9862cd9..d7b1509 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -76,10 +76,38 @@
<!-- Only compile a subset of the files -->
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-generated-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${generated.sources.lite.dir}</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-generated-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${generated.testsources.lite.dir}</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <generatedSourcesDirectory>${generated.sources.lite.dir}</generatedSourcesDirectory>
- <generatedTestSourcesDirectory>${generated.testsources.lite.dir}</generatedTestSourcesDirectory>
<includes>
<include>**/AbstractMessageLite.java</include>
<include>**/AbstractParser.java</include>
diff --git a/java/pom.xml b/java/pom.xml
index 881473f..6789e7c 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -94,7 +94,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index 6b07bcd..0ccfc84 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -79,12 +79,24 @@
</executions>
</plugin>
+ <!-- Add the generated test sources to the build -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- Add the generated test sources to the build -->
- <generatedTestSourcesDirectory>${generated.testsources.dir}</generatedTestSourcesDirectory>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-generated-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${generated.testsources.dir}</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<!-- Configure the OSGI bundle -->

33
protobuf.spec
View File

@ -7,23 +7,20 @@
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%global rcver rc2
Summary: Protocol Buffers - Google's data interchange format
Name: protobuf
Version: 3.1.0
Release: 6%{?dist}
Version: 3.2.0
Release: 0.1.rc2%{?dist}
License: BSD
URL: https://github.com/google/protobuf
Source: https://github.com/google/protobuf/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source: https://github.com/google/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}.tar.gz
Source1: ftdetect-proto.vim
Source2: protobuf-init.el
# For tests
Source3: https://github.com/google/googlemock/archive/release-1.7.0.tar.gz#/googlemock-1.7.0.tar.gz
Source4: https://github.com/google/googletest/archive/release-1.7.0.tar.gz#/googletest-1.7.0.tar.gz
# Thanks to Christopher <ctubbsii@fedoraproject.org>
# Uses build-helper-maven-plugin to add generated sources to the classpath
# Fixes an issue building with newer versions of the maven-compiler-plugin
# (See https://issues.apache.org/jira/browse/MCOMPILER-240)
Patch0: https://github.com/google/protobuf/pull/2327.patch
BuildRequires: autoconf
BuildRequires: automake
@ -225,13 +222,12 @@ Protocol Buffer Parent POM.
%endif
%prep
%setup -q -a 3 -a 4
%setup -q -n %{name}-%{version}%{?rcver} -a 3 -a 4
mv googlemock-release-1.7.0 gmock
mv googletest-release-1.7.0 gmock/gtest
find -name \*.cc -o -name \*.h | xargs chmod -x
chmod 644 examples/*
%if %{with java}
%patch0 -p1
%pom_remove_parent java/pom.xml
%pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/*/pom.xml
# These use easymockclassextension
@ -320,13 +316,13 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
%postun compiler -p /sbin/ldconfig
%files
%{_libdir}/libprotobuf.so.*
%{_libdir}/libprotobuf.so.12*
%doc CHANGES.txt CONTRIBUTORS.txt README.md
%license LICENSE
%files compiler
%{_bindir}/protoc
%{_libdir}/libprotoc.so.*
%{_libdir}/libprotoc.so.12*
%doc README.md
%license LICENSE
@ -343,7 +339,7 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
%{_libdir}/libprotoc.a
%files lite
%{_libdir}/libprotobuf-lite.so.*
%{_libdir}/libprotobuf-lite.so.12*
%files lite-devel
%{_libdir}/libprotobuf-lite.so
@ -356,16 +352,16 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
%files -n python2-protobuf
%dir %{python2_sitelib}/google
%{python2_sitelib}/google/protobuf/
%{python2_sitelib}/protobuf-%{version}-py2.?.egg-info/
%{python2_sitelib}/protobuf-%{version}-py2.?-nspkg.pth
%{python2_sitelib}/protobuf-%{version}%{?rcver}-py2.?.egg-info/
%{python2_sitelib}/protobuf-%{version}%{?rcver}-py2.?-nspkg.pth
%doc python/README.md
%doc examples/add_person.py examples/list_people.py examples/addressbook.proto
%files -n python%{python3_pkgversion}-protobuf
%dir %{python3_sitelib}/google
%{python3_sitelib}/google/protobuf/
%{python3_sitelib}/protobuf-%{version}-py3.?.egg-info/
%{python3_sitelib}/protobuf-%{version}-py3.?-nspkg.pth
%{python3_sitelib}/protobuf-%{version}%{?rcver}-py3.?.egg-info/
%{python3_sitelib}/protobuf-%{version}%{?rcver}-py3.?-nspkg.pth
%doc python/README.md
%doc examples/add_person.py examples/list_people.py examples/addressbook.proto
%endif
@ -401,6 +397,9 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
%endif
%changelog
* Mon Jan 23 2017 Orion Poplawski <orion@cora.nwra.com> - 3.2.0-0.1.rc2
- Update to 3.2.0rc2
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-6
- Rebuild for Python 3.6

4
sources
View File

@ -1,3 +1 @@
14a532a7538551d5def317bfca41dace protobuf-3.1.0.tar.gz
13c3b4a57ad575763deb73fc0ad96e07 googlemock-1.7.0.tar.gz
4ff6353b2560df0afecfbda3b2763847 googletest-1.7.0.tar.gz
SHA512 (protobuf-3.2.0rc2.tar.gz) = a4ab7c3c7a7188f564e0d2a62f66fc7fb9817b10a1504aff9d2dd177cad1233664681d44f8b749cff727c8c48b8a165e29c2828be03ecda6c9de0bfa3f61e6f3