[protobuf] latest sources 2.4.1

[derks]

commit 5ea3fc071a3817c02489b9ada15ddbf8c6d9e632
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Thu Jun 9 15:21:43 2011 -0500

    latest sources 2.4.1

 ...-fixes.patch => protobuf-2.4.1-java-fixes.patch |   19 ++++++++++++-------
 protobuf.spec                                      |   16 ++++++++++------
 2 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/protobuf-java-fixes.patch b/protobuf-2.4.1-java-fixes.patch
similarity index 82%
rename from protobuf-java-fixes.patch
rename to protobuf-2.4.1-java-fixes.patch
index 3d553e8..cb0e300 100644
--- a/protobuf-java-fixes.patch
+++ b/protobuf-2.4.1-java-fixes.patch
@@ -1,6 +1,5 @@
-diff -up protobuf-2.3.0/java/pom.xml.orig protobuf-2.3.0/java/pom.xml
---- protobuf-2.3.0/java/pom.xml.orig	2010-04-21 20:59:56.378273539 -0600
-+++ protobuf-2.3.0/java/pom.xml	2010-04-21 21:28:39.565018649 -0600
+--- protobuf-2.4.1/java/pom.xml.orig	2011-04-30 12:23:04.000000000 -0500
++++ protobuf-2.4.1/java/pom.xml	2011-06-09 14:47:09.554188809 -0500
 @@ -3,11 +3,6 @@
    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">
@@ -12,7 +11,7 @@ diff -up protobuf-2.3.0/java/pom.xml.orig protobuf-2.3.0/java/pom.xml
 -  </parent>
    <groupId>com.google.protobuf</groupId>
    <artifactId>protobuf-java</artifactId>
-   <version>2.3.0</version>
+   <version>2.4.1</version>
 @@ -32,26 +27,6 @@
        scm:svn:http://protobuf.googlecode.com/svn/trunk/
      </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>
          <executions>
            <execution>
-@@ -90,38 +57,6 @@
+@@ -90,44 +57,6 @@
                <goal>run</goal>
              </goals>
            </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/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
@@ -94,8 +99,8 @@ diff -up protobuf-2.3.0/java/pom.xml.orig protobuf-2.3.0/java/pom.xml
          </executions>
        </plugin>
      </plugins>
-@@ -148,18 +83,6 @@
-                 <include>**/UninitializedMessageException.java</include>
+@@ -159,18 +88,6 @@
+                 <include>**/UnmodifiableLazyStringList.java</include>
                  <include>**/WireFormat.java</include>
                </includes>
 -              <testIncludes>
diff --git a/protobuf.spec b/protobuf.spec
index d0a2793..72561b8 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -11,14 +11,14 @@
 
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
-Version:        2.3.0
-Release:        7%{?dist}
+Version:        2.4.1
+Release:        1%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:        ftdetect-proto.vim
-Patch1:		protobuf-2.3.0-fedora-gtest.patch
-Patch2:		protobuf-java-fixes.patch
+Patch1:         protobuf-2.3.0-fedora-gtest.patch
+Patch2:    	    protobuf-2.4.1-java-fixes.patch 
 URL:            http://code.google.com/p/protobuf/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  automake autoconf libtool pkgconfig 
@@ -167,11 +167,11 @@ This package contains the API documentation for %{name}-java.
 %setup -q
 %if %{with gtest}
 rm -rf gtest
-%patch1 -p1
+%patch1 -p1 -b .gtest
 %endif
 chmod 644 examples/*
 %if %{with java}
-%patch2 -p1
+%patch2 -p1 -b .java-fixes
 rm -rf java/src/test
 %endif
 
@@ -317,6 +317,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Jun 09 2011 BJ Dierkes <wdierkes at 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 at lists.fedoraproject.org> - 2.3.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild