latest sources 2.4.1
This commit is contained in:
BJ Dierkes
parent
6493f15fb4
commit
5ea3fc071a
@ -1,6 +1,5 @@
|
|||||||
diff -up protobuf-2.3.0/java/pom.xml.orig protobuf-2.3.0/java/pom.xml
|
--- protobuf-2.4.1/java/pom.xml.orig 2011-04-30 12:23:04.000000000 -0500
|
||||||
--- protobuf-2.3.0/java/pom.xml.orig 2010-04-21 20:59:56.378273539 -0600
|
+++ protobuf-2.4.1/java/pom.xml 2011-06-09 14:47:09.554188809 -0500
|
||||||
+++ protobuf-2.3.0/java/pom.xml 2010-04-21 21:28:39.565018649 -0600
|
|
||||||
@@ -3,11 +3,6 @@
|
@@ -3,11 +3,6 @@
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
@ -12,7 +11,7 @@ diff -up protobuf-2.3.0/java/pom.xml.orig protobuf-2.3.0/java/pom.xml
|
|||||||
- </parent>
|
- </parent>
|
||||||
<groupId>com.google.protobuf</groupId>
|
<groupId>com.google.protobuf</groupId>
|
||||||
<artifactId>protobuf-java</artifactId>
|
<artifactId>protobuf-java</artifactId>
|
||||||
<version>2.3.0</version>
|
<version>2.4.1</version>
|
||||||
@@ -32,26 +27,6 @@
|
@@ -32,26 +27,6 @@
|
||||||
scm:svn:http://protobuf.googlecode.com/svn/trunk/
|
scm:svn:http://protobuf.googlecode.com/svn/trunk/
|
||||||
</connection>
|
</connection>
|
||||||
@ -55,7 +54,7 @@ diff -up protobuf-2.3.0/java/pom.xml.orig protobuf-2.3.0/java/pom.xml
|
|||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
@@ -90,38 +57,6 @@
|
@@ -90,44 +57,6 @@
|
||||||
<goal>run</goal>
|
<goal>run</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
@ -74,6 +73,12 @@ diff -up protobuf-2.3.0/java/pom.xml.orig protobuf-2.3.0/java/pom.xml
|
|||||||
- <arg value="../src/google/protobuf/unittest_mset.proto" />
|
- <arg value="../src/google/protobuf/unittest_mset.proto" />
|
||||||
- <arg
|
- <arg
|
||||||
- value="src/test/java/com/google/protobuf/multiple_files_test.proto" />
|
- 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
|
- <arg
|
||||||
- value="../src/google/protobuf/unittest_optimize_for.proto" />
|
- value="../src/google/protobuf/unittest_optimize_for.proto" />
|
||||||
- <arg
|
- <arg
|
||||||
@ -94,8 +99,8 @@ diff -up protobuf-2.3.0/java/pom.xml.orig protobuf-2.3.0/java/pom.xml
|
|||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
@@ -148,18 +83,6 @@
|
@@ -159,18 +88,6 @@
|
||||||
<include>**/UninitializedMessageException.java</include>
|
<include>**/UnmodifiableLazyStringList.java</include>
|
||||||
<include>**/WireFormat.java</include>
|
<include>**/WireFormat.java</include>
|
||||||
</includes>
|
</includes>
|
||||||
- <testIncludes>
|
- <testIncludes>
|
||||||
@ -11,14 +11,14 @@
|
|||||||
|
|
||||||
Summary: Protocol Buffers - Google's data interchange format
|
Summary: Protocol Buffers - Google's data interchange format
|
||||||
Name: protobuf
|
Name: protobuf
|
||||||
Version: 2.3.0
|
Version: 2.4.1
|
||||||
Release: 7%{?dist}
|
Release: 1%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Source: http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
|
Source: http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
|
||||||
Source1: ftdetect-proto.vim
|
Source1: ftdetect-proto.vim
|
||||||
Patch1: protobuf-2.3.0-fedora-gtest.patch
|
Patch1: protobuf-2.3.0-fedora-gtest.patch
|
||||||
Patch2: protobuf-java-fixes.patch
|
Patch2: protobuf-2.4.1-java-fixes.patch
|
||||||
URL: http://code.google.com/p/protobuf/
|
URL: http://code.google.com/p/protobuf/
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
BuildRequires: automake autoconf libtool pkgconfig
|
BuildRequires: automake autoconf libtool pkgconfig
|
||||||
@ -167,11 +167,11 @@ This package contains the API documentation for %{name}-java.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%if %{with gtest}
|
%if %{with gtest}
|
||||||
rm -rf gtest
|
rm -rf gtest
|
||||||
%patch1 -p1
|
%patch1 -p1 -b .gtest
|
||||||
%endif
|
%endif
|
||||||
chmod 644 examples/*
|
chmod 644 examples/*
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
%patch2 -p1
|
%patch2 -p1 -b .java-fixes
|
||||||
rm -rf java/src/test
|
rm -rf java/src/test
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -317,6 +317,10 @@ rm -rf %{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 09 2011 BJ Dierkes <wdierkes@rackspace.com> - 2.4.1-1
|
||||||
|
- Latest sources from upstream.
|
||||||
|
- Rewrote Patch2 as protobuf-2.4.1-java-fixes.patch
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0-7
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0-7
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user