.cvsignore

@@ -0,0 +1 @@
+protobuf-2.3.0.tar.bz2

.gitignore

@@ -1,18 +0,0 @@
-protobuf-2.3.0.tar.bz2
-/protobuf-2.4.1.tar.bz2
-/protobuf-2.5.0.tar.bz2
-/protobuf-2.6.0.tar.bz2
-/protobuf-2.6.1.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
-/protobuf-3.2.0.tar.gz
-/protobuf-3.3.1.tar.gz
-/protobuf-3.4.1.tar.gz
-/protobuf-3.5.0.tar.gz
-/protobuf-3.6.1-all.tar.gz
-/googletest-1.8.1.tar.gz
-/protobuf-3.11.2-all.tar.gz
-/5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip
-/protobuf-3.11.4-all.tar.gz

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: protobuf
+# $Id: Makefile,v 1.1 2008/11/25 16:39:49 ausil Exp $
+NAME := protobuf
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

import.log

@@ -0,0 +1,2 @@
+protobuf-2_0_2-4_fc8:HEAD:protobuf-2.0.2-4.fc8.src.rpm:1227638780
+protobuf-2_3_0-2_fc14:HEAD:protobuf-2.3.0-2.fc14.src.rpm:1279128992

protobuf-2.3.0-fedora-gtest.patch

@@ -0,0 +1,99 @@
+diff -up protobuf-2.3.0/autogen.sh.orig protobuf-2.3.0/autogen.sh
+--- protobuf-2.3.0/autogen.sh.orig	2010-04-21 18:55:43.857266895 -0600
++++ protobuf-2.3.0/autogen.sh	2010-04-21 19:54:57.386270273 -0600
+@@ -15,25 +15,8 @@ __EOF__
+   exit 1
+ fi
+ 
+-# Check that gtest is present.  Usually it is already there since the
+-# directory is set up as an SVN external.
+-if test ! -e gtest; then
+-  echo "Google Test not present.  Fetching gtest-1.3.0 from the web..."
+-  curl http://googletest.googlecode.com/files/gtest-1.3.0.tar.bz2 | tar jx
+-  mv gtest-1.3.0 gtest
+-fi
+-
+ set -ex
+ 
+-# Temporary hack:  Must change C runtime library to "multi-threaded DLL",
+-#   otherwise it will be set to "multi-threaded static" when MSVC upgrades
+-#   the project file to MSVC 2005/2008.  vladl of Google Test says gtest will
+-#   probably change their default to match, then this will be unnecessary.
+-#   One of these mappings converts the debug configuration and the other
+-#   converts the release configuration.  I don't know which is which.
+-sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g;
+-           s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj
+-
+ # TODO(kenton):  Remove the ",no-obsolete" part and fix the resulting warnings.
+ autoreconf -f -i -Wall,no-obsolete
+ 
+diff -up protobuf-2.3.0/Makefile.am.orig protobuf-2.3.0/Makefile.am
+--- protobuf-2.3.0/Makefile.am.orig	2010-04-21 18:55:38.009265866 -0600
++++ protobuf-2.3.0/Makefile.am	2010-04-21 18:56:15.068016238 -0600
+@@ -11,27 +11,6 @@ SUBDIRS = . src
+ # Always include gtest in distributions.
+ DIST_SUBDIRS = $(subdirs) src
+ 
+-# Build gtest before we build protobuf tests.  We don't add gtest to SUBDIRS
+-# because then "make check" would also build and run all of gtest's own tests,
+-# which takes a lot of time and is generally not useful to us.  Also, we don't
+-# want "make install" to recurse into gtest since we don't want to overwrite
+-# the installed version of gtest if there is one.
+-check-local:
+-	@echo "Making lib/libgtest.a lib/libgtest_main.a in gtest"
+-	@cd gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+-
+-# We would like to clean gtest when "make clean" is invoked.  But we have to
+-# be careful because clean-local is also invoked during "make distclean", but
+-# "make distclean" already recurses into gtest because it's listed among the
+-# DIST_SUBDIRS.  distclean will delete gtest/Makefile, so if we then try to
+-# cd to the directory again and "make clean" it will fail.  So, check that the
+-# Makefile exists before recursing.
+-clean-local:
+-	@if test -e gtest/Makefile; then \
+-	  echo "Making clean in gtest"; \
+-	  cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \
+-	fi
+-
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = protobuf.pc protobuf-lite.pc
+ 
+diff -up protobuf-2.3.0/src/Makefile.am.orig protobuf-2.3.0/src/Makefile.am
+--- protobuf-2.3.0/src/Makefile.am.orig	2010-04-21 18:56:57.342268786 -0600
++++ protobuf-2.3.0/src/Makefile.am	2010-04-21 20:02:40.168268698 -0600
+@@ -276,10 +276,8 @@ COMMON_TEST_SOURCES =                   
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+                  protobuf-lite-test test_plugin $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+-                      $(top_builddir)/gtest/lib/libgtest.la       \
+-                      $(top_builddir)/gtest/lib/libgtest_main.la
+-protobuf_test_CPPFLAGS = -I$(top_srcdir)/gtest/include         \
+-                         -I$(top_builddir)/gtest/include
++                      -lgtest -lgtest_main
++protobuf_test_CPPFLAGS =
+ # Disable optimization for tests unless the user explicitly asked for it,
+ # since test_util.cc takes forever to compile with optimization (with GCC).
+ # See configure.ac for more info.
+@@ -319,11 +317,8 @@ nodist_protobuf_test_SOURCES = $(protoc_
+ 
+ # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
+ protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
+-                      $(top_builddir)/gtest/lib/libgtest.la       \
+-                      $(top_builddir)/gtest/lib/libgtest_main.la
+-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(top_srcdir)/gtest/include    \
+-                                         -I$(top_builddir)/gtest/include  \
+-                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
++                                      -lgtest -lgtest_main
++protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
+ protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lazy_descriptor_test_SOURCES =                        \
+   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
+@@ -341,7 +336,7 @@ nodist_protobuf_lite_test_SOURCES = $(pr
+ 
+ # Test plugin binary.
+ test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+-                    $(top_builddir)/gtest/lib/libgtest.la
++                    -lgtest
+ test_plugin_CPPFLAGS = -I$(top_srcdir)/gtest/include         \
+                        -I$(top_builddir)/gtest/include
+ test_plugin_SOURCES =                                          \

protobuf-init.el

@@ -1,6 +0,0 @@
-; Protobuf major mode, init file by Tim Niemueller [www.niemueller.de], BSD
-; Add mode to automatically recognized modes
-(setq auto-mode-alist (cons '("\\.proto$" . protobuf-mode) auto-mode-alist))
-(autoload 'protobuf-mode "protobuf-mode" "Google protobuf editing mode." t)
-; Turn on colorization by default
-(add-hook 'protobuf-mode-hook 'turn-on-font-lock)

protobuf-java-fixes.patch

@@ -0,0 +1,115 @@
+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
+@@ -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">
+   <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.3.0</version>
+@@ -32,26 +27,6 @@
+       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>
+@@ -62,14 +37,6 @@
+         </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>
+@@ -90,38 +57,6 @@
+               <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_mset.proto" />
+-                  <arg
+-                    value="src/test/java/com/google/protobuf/multiple_files_test.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_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>
+     </plugins>
+@@ -148,18 +83,6 @@
+                 <include>**/UninitializedMessageException.java</include>
+                 <include>**/WireFormat.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>

protobuf.spec

@@ -2,28 +2,29 @@
 %bcond_without python
 # Build -java subpackage
 %bcond_without java
+# Don't require gtest
+%bcond_with gtest
 
-#global rcver rc2
+%if %{with python}
+%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%endif
 
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
-Version:        3.11.4
+Version:        2.3.0
-Release:        1%{?dist}
+Release:        5%{?dist}
 License:        BSD
-URL:            https://github.com/protocolbuffers/protobuf
+Group:          Development/Libraries
-Source:         https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}-all.tar.gz
+Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:        ftdetect-proto.vim
-Source2:        protobuf-init.el
+Patch1:		protobuf-2.3.0-fedora-gtest.patch
-# For tests (using exactly the same version as the release)
+Patch2:		protobuf-java-fixes.patch
-Source3:        https://github.com/google/googletest/archive/5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip
+URL:            http://code.google.com/p/protobuf/
-
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:  autoconf
+BuildRequires:  automake autoconf libtool pkgconfig 
-BuildRequires:  automake
+%if %{with gtest}
-BuildRequires:  emacs
+BuildRequires:  gtest-devel
-BuildRequires:  gcc-c++
+%endif
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-BuildRequires:  zlib-devel
 
 %description
 Protocol Buffers are a way of encoding structured data in an efficient
@@ -39,36 +40,36 @@ variety of languages. You can even update your data structure without
 breaking deployed programs that are compiled against the "old" format.
 
 %package compiler
-Summary:        Protocol Buffers compiler
+Summary: Protocol Buffers compiler
-Requires:       %{name} = %{version}-%{release}
+Group: Development/Libraries
-Obsoletes:      protobuf-emacs < 3.6.1-4
+Requires: %{name} = %{version}-%{release}
-Obsoletes:      protobuf-emacs-el < 3.6.1-4
-Requires:       emacs-filesystem >= %{_emacs_version}
 
 %description compiler
 This package contains Protocol Buffers compiler for all programming
 languages
 
 %package devel
-Summary:        Protocol Buffers C++ headers and libraries
+Summary: Protocol Buffers C++ headers and libraries
-Requires:       %{name} = %{version}-%{release}
+Group: Development/Libraries
-Requires:       %{name}-compiler = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-Requires:       zlib-devel
+Requires: %{name}-compiler = %{version}-%{release}
-Requires:       pkgconfig
+Requires: pkgconfig
 
 %description devel
 This package contains Protocol Buffers compiler for all languages and
 C++ headers and libraries
 
 %package static
-Summary:        Static development files for %{name}
+Summary: Static development files for %{name}
-Requires:       %{name}-devel = %{version}-%{release}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description static
 Static libraries for Protocol Buffers
 
 %package lite
-Summary:        Protocol Buffers LITE_RUNTIME libraries
+Summary: Protocol Buffers LITE_RUNTIME libraries
+Group: Development/Libraries
 
 %description lite
 Protocol Buffers built with optimize_for = LITE_RUNTIME.
@@ -78,9 +79,9 @@ which only depends libprotobuf-lite, which is much smaller than libprotobuf but
 lacks descriptors, reflection, and some other features.
 
 %package lite-devel
-Summary:        Protocol Buffers LITE_RUNTIME development libraries
+Summary: Protocol Buffers LITE_RUNTIME development libraries
-Requires:       %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
-Requires:       %{name}-lite = %{version}-%{release}
+Requires: %{name}-lite = %{version}-%{release}
 
 %description lite-devel
 This package contains development libraries built with 
@@ -91,8 +92,9 @@ which only depends libprotobuf-lite, which is much smaller than libprotobuf but
 lacks descriptors, reflection, and some other features.
 
 %package lite-static
-Summary:        Static development files for %{name}-lite
+Summary: Static development files for %{name}-lite
-Requires:       %{name}-devel = %{version}-%{release}
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
 
 %description lite-static
 This package contains static development libraries built with 
@@ -103,127 +105,76 @@ which only depends libprotobuf-lite, which is much smaller than libprotobuf but
 lacks descriptors, reflection, and some other features.
 
 %if %{with python}
-%package -n python%{python3_pkgversion}-%{name}
+%package python
-Summary:        Python 3 bindings for Google Protocol Buffers
+Summary: Python bindings for Google Protocol Buffers
-BuildArch:      noarch
+Group: Development/Languages
-BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires: python-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires: python-setuptools-devel
-Requires:       python%{python3_pkgversion}-six >= 1.9
+Conflicts: %{name}-compiler > %{version}
-Conflicts:      %{name}-compiler > %{version}
+Conflicts: %{name}-compiler < %{version}
-Conflicts:      %{name}-compiler < %{version}
-Provides:       %{name}-python3 = %{version}-%{release}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
 
-%description -n python%{python3_pkgversion}-%{name}
+%description python
-This package contains Python 3 libraries for Google Protocol Buffers
+This package contains Python libraries for Google Protocol Buffers
 %endif
 
 %package vim
-Summary:        Vim syntax highlighting for Google Protocol Buffers descriptions
+Summary: Vim syntax highlighting for Google Protocol Buffers descriptions
-BuildArch:      noarch
+Group: Development/Libraries
-Requires:       vim-enhanced
+Requires: vim-enhanced
 
 %description vim
 This package contains syntax highlighting for Google Protocol Buffers
 descriptions in Vim editor
 
-
 %if %{with java}
 %package java
-Summary:        Java Protocol Buffers runtime library
+Summary: Java Protocol Buffers runtime library
-BuildArch:      noarch
+Group:   Development/Languages
-BuildRequires:  maven-local
+BuildRequires:    java-devel >= 1.6
-BuildRequires:  mvn(com.google.code.gson:gson)
+BuildRequires:    jpackage-utils
-BuildRequires:  mvn(com.google.guava:guava)
+BuildRequires:    maven2
-BuildRequires:  mvn(junit:junit)
+BuildRequires:    maven2-plugin-compiler
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:    maven2-plugin-install
-BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:    maven2-plugin-jar
-BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:    maven2-plugin-javadoc
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+#BuildRequires:    maven2-plugin-release
-BuildRequires:  mvn(org.easymock:easymock)
+BuildRequires:    maven-doxia
-Conflicts:      %{name}-compiler > %{version}
+BuildRequires:    maven-doxia-sitetools
-Conflicts:      %{name}-compiler < %{version}
+BuildRequires:    maven2-plugin-resources
-Obsoletes:      %{name}-javanano < 3.6.0
+BuildRequires:    maven2-plugin-surefire
+BuildRequires:    maven2-plugin-antrun
+Requires:         java
+Requires:         jpackage-utils
+Requires(post):   jpackage-utils
+Requires(postun): jpackage-utils
+Conflicts:        %{name}-compiler > %{version}
+Conflicts:        %{name}-compiler < %{version}
 
 %description java
 This package contains Java Protocol Buffers runtime library.
 
-%package javalite
-Summary:        Java Protocol Buffers lite runtime library
-BuildArch:      noarch
-
-%description javalite
-This package contains Java Protocol Buffers lite runtime library.
-
-%package java-util
-Summary:        Utilities for Protocol Buffers
-BuildArch:      noarch
-
-%description java-util
-Utilities to work with protos. It contains JSON support
-as well as utilities to work with proto3 well-known types.
-
 %package javadoc
-Summary:        Javadoc for %{name}-java
+Summary: Javadocs for %{name}-java
-BuildArch:      noarch
+Group:   Documentation
+Requires: jpackage-utils
+Requires: %{name}-java = %{version}-%{release}
 
 %description javadoc
 This package contains the API documentation for %{name}-java.
 
-%package parent
-Summary:        Protocol Buffer Parent POM
-BuildArch:      noarch
-
-%description parent
-Protocol Buffer Parent POM.
-
-%package bom
-Summary:        Protocol Buffer BOM POM
-BuildArch:      noarch
-
-%description bom
-Protocol Buffer BOM POM.
-
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}%{?rcver} -a 3
+%setup -q
-%autopatch -p1
+%if %{with gtest}
-mv googletest-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081/* third_party/googletest/
+rm -rf gtest
-find -name \*.cc -o -name \*.h | xargs chmod -x
+%patch1 -p1
+%endif
 chmod 644 examples/*
 %if %{with java}
-%pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml
+%patch2 -p1
-%pom_remove_dep com.google.truth:truth java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml
+rm -rf java/src/test
-%pom_remove_dep com.google.errorprone:error_prone_annotations java/util/pom.xml
-%pom_remove_dep com.google.guava:guava-testlib java/pom.xml java/util/pom.xml
-# These use easymockclassextension
-rm java/core/src/test/java/com/google/protobuf/ServiceTest.java
-# These use truth or error_prone_annotations or guava-testlib
-rm java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
-rm java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
-rm java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
-rm java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
-rm -r java/util/src/test/java/com/google/protobuf/util
-rm -r java/util/src/main/java/com/google/protobuf/util
-
-# Make OSGi dependency on sun.misc package optional
-%pom_xpath_inject "pom:configuration/pom:instructions" "<Import-Package>sun.misc;resolution:=optional,*</Import-Package>" java/core
-
-# Backward compatibility symlink
-%mvn_file :protobuf-java:jar: %{name}/%{name}-java %{name}
-
-# This test is incredibly slow on arm
-# https://github.com/google/protobuf/issues/2389
-%ifarch %{arm} s390x
-mv java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java \
-   java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java.slow
-mv java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java \
-   java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java.slow
 %endif
-%endif
-
-rm -f src/solaris/libstdc++.la
 
 %build
 iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
@@ -232,372 +183,141 @@ export PTHREAD_LIBS="-lpthread"
 ./autogen.sh
 %configure
 
-%make_build
+make %{?_smp_mflags}
 
 %if %{with python}
 pushd python
-%py3_build
+python ./setup.py build
+sed -i -e 1d build/lib/google/protobuf/descriptor_pb2.py
 popd
 %endif
 
 %if %{with java}
-%ifarch s390x %{arm}
+pushd java
-export MAVEN_OPTS=-Xmx1024m
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
+popd
 %endif
-%mvn_build -s -- -f java/pom.xml
-%endif
-
-%{_emacs_bytecompile} editors/protobuf-mode.el
-
 
 %check
-# Java tests fail on s390x
+make %{?_smp_mflags} check
-%ifarch s390x
-fail=0
-%else
-fail=1
-%endif
-make %{?_smp_mflags} check || exit $fail
-
 
 %install
-%make_install %{?_smp_mflags} STRIPBINARIES=no INSTALL="%{__install} -p" CPPROG="cp -p"
+rm -rf %{buildroot}
+make %{?_smp_mflags} install DESTDIR=%{buildroot} STRIPBINARIES=no INSTALL="%{__install} -p" CPPROG="cp -p"
 find %{buildroot} -type f -name "*.la" -exec rm -f {} \;
 
 %if %{with python}
 pushd python
-#python ./setup.py install --root=%{buildroot} --single-version-externally-managed --record=INSTALLED_FILES --optimize=1
+python ./setup.py install --root=%{buildroot} --single-version-externally-managed --record=INSTALLED_FILES --optimize=1
-%py3_install
-find %{buildroot}%{python3_sitelib} -name \*.py |
-  xargs sed -i -e '1{\@^#!@d}'
 popd
 %endif
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/proto.vim
 install -p -m 644 -D editors/proto.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/proto.vim
 
 %if %{with java}
-%mvn_install
+pushd java
+install -d -m 755 %{buildroot}%{_javadir}
+install -pm 644 target/%{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
+
+install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
+install -pm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+
 %endif
 
-mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name}
+%post -p /sbin/ldconfig
-install -p -m 0644 editors/protobuf-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}
+%postun -p /sbin/ldconfig
-install -p -m 0644 editors/protobuf-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name}
-mkdir -p %{buildroot}%{_emacs_sitestartdir}
-install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
 
-%ldconfig_scriptlets
+%post lite -p /sbin/ldconfig
-%ldconfig_scriptlets lite
+%postun lite -p /sbin/ldconfig
-%ldconfig_scriptlets compiler
+
+%post compiler -p /sbin/ldconfig
+%postun compiler -p /sbin/ldconfig
+
+%if %{with java}
+%post java
+%update_maven_depmap
+
+%postun java
+%update_maven_depmap
+%endif
+
+%clean
+rm -rf %{buildroot}
 
 %files
-%doc CHANGES.txt CONTRIBUTORS.txt README.md
+%defattr(-, root, root, -)
-%license LICENSE
+%{_libdir}/libprotobuf.so.*
-%{_libdir}/libprotobuf.so.22*
+%doc CHANGES.txt CONTRIBUTORS.txt COPYING.txt README.txt
 
 %files compiler
-%doc README.md
+%defattr(-, root, root, -)
-%license LICENSE
 %{_bindir}/protoc
-%{_libdir}/libprotoc.so.22*
+%{_libdir}/libprotoc.so.*
-%{_emacs_sitelispdir}/%{name}/
+%doc COPYING.txt README.txt
-%{_emacs_sitestartdir}/protobuf-init.el
 
 %files devel
+%defattr(-, root, root, -)
 %dir %{_includedir}/google
 %{_includedir}/google/protobuf/
 %{_libdir}/libprotobuf.so
 %{_libdir}/libprotoc.so
 %{_libdir}/pkgconfig/protobuf.pc
-%doc examples/add_person.cc examples/addressbook.proto examples/list_people.cc examples/Makefile examples/README.md
+%doc examples/add_person.cc examples/addressbook.proto examples/list_people.cc examples/Makefile examples/README.txt
 
 %files static
+%defattr(-, root, root, -)
 %{_libdir}/libprotobuf.a
 %{_libdir}/libprotoc.a
 
 %files lite
-%{_libdir}/libprotobuf-lite.so.22*
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf-lite.so.*
 
 %files lite-devel
+%defattr(-, root, root, -)
 %{_libdir}/libprotobuf-lite.so
 %{_libdir}/pkgconfig/protobuf-lite.pc
 
 %files lite-static
+%defattr(-, root, root, -)
 %{_libdir}/libprotobuf-lite.a
 
 %if %{with python}
-%files -n python%{python3_pkgversion}-protobuf
+%files python
-%dir %{python3_sitelib}/google
+%defattr(-, root, root, -)
-%{python3_sitelib}/google/protobuf/
+%dir %{python_sitelib}/google
-%{python3_sitelib}/protobuf-%{version}%{?rcver}-py3.*.egg-info/
+%{python_sitelib}/google/protobuf/
-%{python3_sitelib}/protobuf-%{version}%{?rcver}-py3.*-nspkg.pth
+%{python_sitelib}/protobuf-%{version}-py2.?.egg-info/
-%doc python/README.md
+%{python_sitelib}/protobuf-%{version}-py2.?-nspkg.pth
+%doc python/README.txt 
 %doc examples/add_person.py examples/list_people.py examples/addressbook.proto
 %endif
 
 %files vim
+%defattr(-, root, root, -)
 %{_datadir}/vim/vimfiles/ftdetect/proto.vim
 %{_datadir}/vim/vimfiles/syntax/proto.vim
 
 %if %{with java}
-%files java -f .mfiles-protobuf-java
+%files java
+%defattr(-, root, root, -)
+%{_datadir}/maven2/poms/JPP-protobuf.pom
+%{_mavendepmapfragdir}/protobuf
+%{_javadir}/*
 %doc examples/AddPerson.java examples/ListPeople.java
-%doc java/README.md
-%license LICENSE
 
-%files java-util -f .mfiles-protobuf-java-util
+%files javadoc
-
+%defattr(-, root, root, -)
-%files javadoc -f .mfiles-javadoc
+%{_javadocdir}/%{name}
-%license LICENSE
-
-%files parent -f .mfiles-protobuf-parent
-%license LICENSE
-
-%files bom -f .mfiles-protobuf-bom
-%license LICENSE
-
-%files javalite -f .mfiles-protobuf-javalite
-%license LICENSE
 %endif
 
-
 %changelog
-* Tue Mar 31 2020 Adrian Reber <adrian@lisas.de> - 3.11.4-1
-- Update to 3.11.4
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Dec 18 2019 Adrian Reber <adrian@lisas.de> - 3.11.2-1
-- Update to 3.11.2
-
-* Tue Nov 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.6.1-9
-- Drop python2-protobuf (#1765879)
-
-* Sat Oct 26 2019 Orion Poplawski <orion@nwra.com> - 3.6.1-8
-- Drop obsolete BR on python-google-apputils
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.6.1-7
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.6.1-6
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed May 8 2019 Orion Poplawski <orion@nwra.com> - 3.6.1-4
-- Update emacs packaging to comply with guidelines
-
-* Wed Feb 27 2019 Orion Poplawski <orion@nwra.com> - 3.6.1-3
-- Update googletest to 1.8.1 to re-enable tests
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Oct 23 2018 Felix Kaechele <heffer@fedoraproject.org> - 3.6.1-1
-- update to 3.6.1
-- obsolete javanano subpackage; discontinued upstream
-
-* Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.5.0-8
-- Rebuild for new binutils
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.0-6
-- Rebuilt for Python 3.7
-
-* Wed Feb 21 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.5.0-5
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.5.0-4
-- Escape macros in %%changelog
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.5.0-2
-- Switch to %%ldconfig_scriptlets
-
-* Thu Nov 23 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.5.0-1
-- Update to 3.5.0
-
-* Mon Nov 13 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.4.1-1
-- Update to 3.4.1
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 27 2017 Mat Booth <mat.booth@redhat.com> - 3.3.1-2
-- Make OSGi dependency on sun.misc package optional. This package is not
-  available in all execution environments and will not be available in Java 9.
-
-* Mon Jun 12 2017 Orion Poplawski <orion@cora.nwra.com> - 3.3.1-1
-- Update to 3.3.1
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 27 2017 Orion Poplawski <orion@cora.nwra.com> - 3.2.0-1
-- Update to 3.2.0 final
-
-* 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
-
-* Sat Nov 19 2016 Orion Poplawski <orion@cora.nwra.com> - 3.1.0-5
-- Disable slow test on arm
-
-* Fri Nov 18 2016 Orion Poplawski <orion@cora.nwra.com> - 3.1.0-4
-- Ship python 3 module
-
-* Fri Nov 18 2016 Orion Poplawski <orion@cora.nwra.com> - 3.1.0-3
-- Fix jar file compat symlink
-
-* Fri Nov 18 2016 Orion Poplawski <orion@cora.nwra.com> - 3.1.0-2
-- Add needed python requirement
-
-* Fri Nov 04 2016 Orion Poplawski <orion@cora.nwra.com> - 3.1.0-2
-- Make various sub-packages noarch
-
-* Fri Nov 04 2016 gil cattaneo <puntogil@libero.it> 3.1.0-2
-- enable javanano
-- minor changes to adapt to current guidelines
-
-* Fri Nov 04 2016 Orion Poplawski <orion@cora.nwra.com> - 3.1.0-1
-- Update to 3.1.0
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.1-5
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jan 20 2016 Orion Poplawski <orion@cora.nwra.com> - 2.6.1-3
-- Tests no longer segfaulting on arm
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Apr 6 2015 Orion Poplawski <orion@cora.nwra.com> - 2.6.1-1
-- Update to 2.6.1
-- New URL
-- Cleanup spec
-- Add patch to fix emacs compilation with emacs 24.4
-- Drop java-fixes patch, use pom macros instead
-- Add BR on python-google-apputils and mvn(org.easymock:easymock)
-- Run make check
-- Make -static require -devel (bug #1067475)
-
-* Thu Mar 26 2015 Kalev Lember <kalevlember@gmail.com> - 2.6.0-4
-- Rebuilt for GCC 5 ABI change
-
-* Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.6.0-3
-- Rebuilt for Fedora 23 Change
-  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
-
-* Wed Dec 17 2014 Peter Lemenkov <lemenkov@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@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@uw.edu> - 2.5.0-11
-- protobuf-emacs requires emacs(bin), not emacs (rh# 1154456)
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Jun 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.0-9
-- Update to current Java packaging guidelines
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.5.0-7
-- Use Requires: java-headless rebuild (#1067528)
-
-* Thu Dec 12 2013 Conrad Meyer <cemeyer@uw.edu> - 2.5.0-6
-- BR python-setuptools-devel -> python-setuptools
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu May 16 2013 Dan Horák <dan[at]danny.cz> - 2.5.0-4
-- export the new generic atomics header (rh #926374)
-
-* Mon May 6 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.5.0-3
-- Add support for generic gcc atomic operations (rh #926374)
-
-* Sat Apr 27 2013 Conrad Meyer <cemeyer@uw.edu> - 2.5.0-2
-- Remove changelog history from before 2010
-- This spec already runs autoreconf -fi during %%build, but bump build for
-  rhbz #926374
-
-* Sat Mar 9 2013 Conrad Meyer <cemeyer@uw.edu> - 2.5.0-1
-- Bump to latest upstream (#883822)
-- Rebase gtest, maven patches on 2.5.0
-
-* Tue Feb 26 2013 Conrad Meyer <cemeyer@uw.edu> - 2.4.1-12
-- Nuke BR on maven-doxia, maven-doxia-sitetools (#915620)
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2.4.1-10
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Sun Jan 20 2013 Conrad Meyer <konrad@tylerc.org> - 2.4.1-9
-- Fix packaging bug, -emacs-el subpackage should depend on -emacs subpackage of
-  the same version (%%version), not the emacs version number...
-
-* Thu Jan 17 2013 Tim Niemueller <tim@niemueller.de> - 2.4.1-8
-- Added sub-package for Emacs editing mode
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Mar 19 2012 Dan Horák <dan[at]danny.cz> - 2.4.1-6
-- disable test-suite until g++ 4.7 issues are resolved
-
-* Mon Mar 19 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.4.1-5
-- Update to latest java packaging guidelines
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-4
-- Rebuilt for c++ ABI breakage
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Sep 27 2011 Pierre-Yves Chibon <pingou@pingoured.fr> - 2.4.1-2
-- Adding zlib-devel as BR (rhbz: #732087)
-
-* 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
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Jan 13 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.3.0-6
-- Fix java subpackage bugs #669345 and #669346
-- Use new maven plugin names
-- Use mavenpomdir macro for pom installation
-
 * Mon Jul 26 2010 David Malcolm <dmalcolm@redhat.com> - 2.3.0-5
 - generalize hardcoded reference to 2.6 in python subpackage %%files manifest
 
@@ -605,10 +325,76 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
 * Thu Jul 15 2010 James Laska <jlaska@redhat.com> - 2.3.0-3
-- Correct use of %%bcond macros
+- Correct use of %bcond macros
 
 * Wed Jul 14 2010 James Laska <jlaska@redhat.com> - 2.3.0-2
 - Enable python and java sub-packages
 
 * Tue May 4 2010 Conrad Meyer <konrad@tylerc.org> - 2.3.0-1
 - bump to 2.3.0
+
+* Wed Sep 30 2009 Lev Shamardin <shamardin@gmail.com> - 2.2.0-2
+- added export PTHREAD_LIBS="-lpthread"
+
+* Fri Sep 18 2009 Lev Shamardin <shamardin@gmail.com> - 2.2.0-1
+- Upgraded to upstream protobuf-2.2.0
+- New -lite packages
+
+* Sun Mar 01 2009 Caolán McNamra <caolanm@redhat.com> - 2.0.2-8
+- add stdio.h for sprintf, perror, etc.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Dec 23 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.2-6
+- Small fixes for python 2.6 eggs.
+- Temporarily disabled java subpackage due to build problems, will be fixed and
+  turned back on in future.
+
+* Thu Nov 27 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.2-5
+- No problems with ppc & ppc64 arch in rawhide, had to do a release bump.
+
+* Sat Nov 22 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.2-4
+- Added patch from subversion r70 to workaround gcc 4.3.0 bug (see
+  http://code.google.com/p/protobuf/issues/detail?id=45 for more
+  details).
+
+* Tue Nov 11 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.2-3
+- Added conflicts to java and python subpackages to prevent using with
+  wrong compiler versions.
+- Fixed license.
+- Fixed BuildRequires for -python subpackage.
+- Fixed Requires and Group for -javadoc subpackage.
+- Fixed Requires for -devel subpackage.
+- Fixed issue with wrong shebang in descriptor_pb2.py.
+- Specify build options via --with/--without.
+- Use Fedora-packaged gtest library instead of a bundled one by
+  default (optional).
+
+* Fri Oct 31 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.2-2
+- Use python_sitelib macro instead of INSTALLED_FILES.
+- Fix the license.
+- Fix redundant requirement for -devel subpackage.
+- Fix wrong dependences for -python subpackage.
+- Fix typo in requirements for -javadoc subpackage.
+- Use -p option for cp and install to preserve timestamps.
+- Remove unneeded ldconfig call for post scripts of -devel subpackage.
+- Fix directories ownership.
+
+* Sun Oct 12 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.2-1
+- Update to version 2.0.2
+- New -java and -javadoc subpackages.
+- Options to disable building of -python and -java* subpackages
+
+* Mon Sep 15 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.1-2
+- Added -p switch to install commands to preserve timestamps.
+- Fixed Version and Libs in pkgconfig script.
+- Added pkgconfig requires for -devel package.
+- Removed libtool archives from -devel package.
+
+* Thu Sep 04 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.1-1
+- Updated to 2.0.1 version.
+
+* Wed Aug 13 2008 Lev Shamardin <shamardin@gmail.com> - 2.0.0-0.1.beta
+- Initial package version. Credits for vim subpackage and pkgconfig go
+  to Rick L Vinyard Jr <rvinyard@cs.nmsu.edu>

sources

@@ -1,2 +1 @@
-SHA512 (protobuf-3.11.4-all.tar.gz) = 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+f2964f636b3c67d1e9d8b90819fa8ddb  protobuf-2.3.0.tar.bz2
-SHA512 (5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip) = ba904f3a0b606357873db938986b0abf37425a65501340fe81f73f9c5d05f542429662fe71c0b10e4796cb6335ae9a687fc9fb21084f2f5bfd2ede79977f5821