Request 1522 (accepted)

Overview

Request 1522 (accepted)

Submit protobuf to Winterfell

Created by vanmeeuwen over 8 years ago
In state accepted

Submit protobuf

Submit package Kolab:Development / protobuf to package Kolab:Winterfell / protobuf

protobuf.spec Added

@@ -0,0 +1,461 @@
+%if 0%{?opensuse_bs}
+#!BuildIgnore:  emacs-el
+#!BuildIgnore:  ghostscript-x11
+%endif
+
+%global with_emacs 0
+%global with_python 1
+%global with_java 0
+%global with_gtest 0
+
+%if %{with_python}
+%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%endif
+
+%global emacs_version %(pkg-config emacs --modversion)
+%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
+%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
+
+Summary:        Protocol Buffers - Google's data interchange format
+Name:           protobuf
+Version:        2.6.1
+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.6.0-java-fixes.patch
+Patch3:         protobuf-2.5.0-emacs-24.4.patch
+
+URL:            http://code.google.com/p/protobuf/
+BuildRequires:  gcc-c++
+BuildRequires:  automake autoconf libtool pkgconfig zlib-devel
+
+%if 0%{?with_emacs}
+%if 0%{?opensuse_bs}
+BuildRequires:  emacs
+%else
+BuildRequires:  emacs(bin)
+%endif
+BuildRequires:  emacs-el >= 24.1
+%endif
+
+%if %{with_gtest}
+BuildRequires:  gtest-devel
+%endif
+
+%description
+Protocol Buffers are a way of encoding structured data in an efficient
+yet extensible format. Google uses Protocol Buffers for almost all of
+its internal RPC protocols and file formats.
+
+Protocol buffers are a flexible, efficient, automated mechanism for
+serializing structured data – think XML, but smaller, faster, and
+simpler. You define how you want your data to be structured once, then
+you can use special generated source code to easily write and read
+your structured data to and from a variety of data streams and using a
+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
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description compiler
+This package contains Protocol Buffers compiler for all programming
+languages
+
+%package devel
+Summary: Protocol Buffers C++ headers and libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-compiler = %{version}-%{release}
+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}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description static
+Static libraries for Protocol Buffers
+
+%package lite
+Summary: Protocol Buffers LITE_RUNTIME libraries
+Group: Development/Libraries
+
+%description lite
+Protocol Buffers built with optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+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
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-lite = %{version}-%{release}
+
+%description lite-devel
+This package contains development libraries built with
+optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+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
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description lite-static
+This package contains static development libraries built with
+optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+which only depends libprotobuf-lite, which is much smaller than libprotobuf but
+lacks descriptors, reflection, and some other features.
+
+%if %{with_python}
+%package python
+Summary: Python bindings for Google Protocol Buffers
+Group: Development/Languages
+BuildRequires: python-dateutil
+BuildRequires: python-devel
+BuildRequires: python-gflags
+BuildRequires: python-google-apputils
+BuildRequires: python-setuptools
+BuildRequires: pytz
+Requires: python-dateutil
+Requires: python-gflags
+Requires: python-google-apputils
+Requires: python-setuptools
+Requires: pytz
+Conflicts: %{name}-compiler > %{version}
+Conflicts: %{name}-compiler < %{version}
+
+%description python
+This package contains Python libraries for Google Protocol Buffers
+%endif
+
+%package vim
+Summary: Vim syntax highlighting for Google Protocol Buffers descriptions
+Group: Development/Libraries
+Requires: vim-enhanced
+
+%description vim
+This package contains syntax highlighting for Google Protocol Buffers
+descriptions in Vim editor
+
+%if 0%{?with_emacs}
+%package emacs
+Summary: Emacs mode for Google Protocol Buffers descriptions
+Group: Applications/Editors
+Requires: emacs(bin) >= 0%{emacs_version}
+
+%description emacs
+This package contains syntax highlighting for Google Protocol Buffers
+descriptions in the Emacs editor.
+
+%package emacs-el
+Summary: Elisp source files for Google protobuf Emacs mode
+Group: Applications/Editors
+Requires: protobuf-emacs = %{version}
+
+%description emacs-el
+This package contains the elisp source files for %{pkgname}-emacs
+under GNU Emacs. You do not need to install this package to use
+%{pkgname}-emacs.
+%endif
+
+%if %{with_java}
+%package java
+Summary: Java Protocol Buffers runtime library
+Group:   Development/Languages
+BuildRequires:    maven-local
+BuildRequires:    mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:    mvn(org.apache.maven.plugins:maven-antrun-plugin)
+Conflicts:        %{name}-compiler > %{version}
+Conflicts:        %{name}-compiler < %{version}
+
+%description java
+This package contains Java Protocol Buffers runtime library.
+
+%package javadoc
+Summary: Javadocs for %{name}-java
+Group:   Documentation
+Requires: %{name}-java = %{version}-%{release}
+
+%description javadoc
+This package contains the API documentation for %{name}-java.
+
+%endif
+
+%prep
+%setup -q
+%if %{with_gtest}
+rm -rf gtest
+%patch1 -p1 -b .gtest
+%endif
+chmod 644 examples/*
+%if %{with_java}
+%patch2 -p1 -b .java-fixes
+rm -rf java/src/test
+%endif
+
+%if 0%{?fedora} > 22 && 0%{?with_emacs}
+%patch3 -p1 -b .emacs
+%endif
+
+%build
+iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
+mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
+export PTHREAD_LIBS="-lpthread"
+./autogen.sh
+%configure
+
+make %{?_smp_mflags}
+
+%if %{with_python}
+pushd python
+python ./setup.py build
+sed -i -e 1d build/lib/google/protobuf/descriptor_pb2.py
+popd
+%endif
+
+%if %{with_java}
+pushd java
+%mvn_file : %{name}
+%mvn_build
+popd
+%endif
+
+%if 0%{?with_emacs}
+emacs -batch -f batch-byte-compile editors/protobuf-mode.el
+%endif
+
+%check
+#make %{?_smp_mflags} check
+
+%install
+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} --record=INSTALLED_FILES --optimize=1
+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}
+pushd java
+%mvn_install
+popd
+%endif
+
+%if 0%{?with_emacs}
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
+mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
+install -p -m 0644 editors/protobuf-mode.el $RPM_BUILD_ROOT%{emacs_lispdir}
+install -p -m 0644 editors/protobuf-mode.elc $RPM_BUILD_ROOT%{emacs_lispdir}
+install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
+%endif
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post lite -p /sbin/ldconfig
+%postun lite -p /sbin/ldconfig
+
+%post compiler -p /sbin/ldconfig
+%postun compiler -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf.so.*
+%doc CHANGES.txt CONTRIBUTORS.txt
+
+%files compiler
+%defattr(-, root, root, -)
+%{_bindir}/protoc
+%{_libdir}/libprotoc.so.*
+
+%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.txt
+
+%files static
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf.a
+%{_libdir}/libprotoc.a
+
+%files lite
+%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 python
+%defattr(-, root, root, -)
+%dir %{python_sitelib}/google
+%exclude %{python_sitelib}/google/__init__.py*
+%{python_sitelib}/google/protobuf/
+%{python_sitelib}/protobuf-%{version}-py2.?.egg-info
+%{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 0%{?with_emacs}
+%files emacs
+%defattr(-,root,root,-)
+%{emacs_startdir}/protobuf-init.el
+%{emacs_lispdir}/protobuf-mode.elc
+
+%files emacs-el
+%defattr(-,root,root,-)
+%{emacs_lispdir}/protobuf-mode.el
+%endif
+
+%if %{with_java}
+%files java -f java/.mfiles
+%defattr(-, root, root, -)
+%doc examples/AddPerson.java examples/ListPeople.java
+
+%files javadoc -f java/.mfiles-javadoc
+%defattr(-, root, root, -)
+%endif
+
+%changelog
+* 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
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.3.0-4
+- 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
+
+* 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

protobuf-2.5.0-emacs-24.4.patch Added

protobuf-2.5.0-fedora-gtest.patch Added

@@ -0,0 +1,215 @@
+--- protobuf-2.5.0/autogen.sh.orig	2013-02-26 09:56:44.000000000 -0800
++++ protobuf-2.5.0/autogen.sh	2013-03-09 19:21:52.512010330 -0800
+@@ -1,41 +1,24 @@
+ #!/bin/sh
+ 
+ # Run this script to generate the configure script and other files that will
+ # be included in the distribution.  These files are not checked in because they
+ # are automatically generated.
+ 
+ set -e
+ 
+ # Check that we're being run from the right directory.
+ if test ! -f src/google/protobuf/stubs/common.h; then
+   cat >&2 << __EOF__
+ Could not find source code.  Make sure you are running this script from the
+ root of the distribution tree.
+ __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.5.0 from the web..."
+-  curl http://googletest.googlecode.com/files/gtest-1.5.0.tar.bz2 | tar jx
+-  mv gtest-1.5.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
+ 
+ rm -rf autom4te.cache config.h.in~
+ exit 0
+--- protobuf-2.5.0/Makefile.am.orig	2013-02-26 09:56:44.000000000 -0800
++++ protobuf-2.5.0/Makefile.am	2013-03-09 19:22:18.741692020 -0800
+@@ -1,54 +1,33 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+ # Build . before src so that our all-local and clean-local hooks kicks in at
+ # the right time.
+ 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
+ 
+ EXTRA_DIST =                                                                 \
+   autogen.sh                                                                 \
+   generate_descriptor_proto.sh                                               \
+   README.txt                                                                 \
+   INSTALL.txt                                                                \
+   COPYING.txt                                                                \
+   CONTRIBUTORS.txt                                                           \
+   CHANGES.txt                                                                \
+   editors/README.txt                                                         \
+   editors/proto.vim                                                          \
+   editors/protobuf-mode.el                                                   \
+   vsprojects/config.h                                                        \
+   vsprojects/extract_includes.bat                                            \
+   vsprojects/libprotobuf.vcproj                                              \
+   vsprojects/libprotobuf-lite.vcproj                                         \
+   vsprojects/libprotoc.vcproj                                                \
+   vsprojects/protobuf.sln                                                    \
+--- protobuf-2.5.0/src/Makefile.am.orig	2013-02-26 09:56:43.000000000 -0800
++++ protobuf-2.5.0/src/Makefile.am	2013-03-09 19:25:09.076620571 -0800
+@@ -286,44 +286,42 @@
+ # building out-of-tree.
+ unittest_proto_middleman: protoc$(EXEEXT) $(protoc_inputs)
+ 	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/protoc$(EXEEXT) -I. --cpp_out=$$oldpwd $(protoc_inputs) )
+ 	touch unittest_proto_middleman
+ 
+ endif
+ 
+ $(protoc_outputs): unittest_proto_middleman
+ 
+ COMMON_TEST_SOURCES =                                          \
+   google/protobuf/test_util.cc                                 \
+   google/protobuf/test_util.h                                  \
+   google/protobuf/testing/googletest.cc                        \
+   google/protobuf/testing/googletest.h                         \
+   google/protobuf/testing/file.cc                              \
+   google/protobuf/testing/file.h
+ 
+ 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
++                      -lgtest -lgtest_main
+-protobuf_test_CPPFLAGS = -I$(top_srcdir)/gtest/include         \
+-                         -I$(top_builddir)/gtest/include
++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.
+ protobuf_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_test_SOURCES =                                        \
+   google/protobuf/stubs/common_unittest.cc                     \
+   google/protobuf/stubs/once_unittest.cc                       \
+   google/protobuf/stubs/strutil_unittest.cc                    \
+   google/protobuf/stubs/structurally_valid_unittest.cc         \
+   google/protobuf/stubs/stringprintf_unittest.cc               \
+   google/protobuf/stubs/template_util_unittest.cc              \
+   google/protobuf/stubs/type_traits_unittest.cc                \
+   google/protobuf/descriptor_database_unittest.cc              \
+   google/protobuf/descriptor_unittest.cc                       \
+   google/protobuf/dynamic_message_unittest.cc                  \
+   google/protobuf/extension_set_unittest.cc                    \
+   google/protobuf/generated_message_reflection_unittest.cc     \
+   google/protobuf/message_unittest.cc                          \
+   google/protobuf/reflection_ops_unittest.cc                   \
+   google/protobuf/repeated_field_unittest.cc                   \
+@@ -335,61 +333,58 @@
+   google/protobuf/io/printer_unittest.cc                       \
+   google/protobuf/io/tokenizer_unittest.cc                     \
+   google/protobuf/io/zero_copy_stream_unittest.cc              \
+   google/protobuf/compiler/command_line_interface_unittest.cc  \
+   google/protobuf/compiler/importer_unittest.cc                \
+   google/protobuf/compiler/mock_code_generator.cc              \
+   google/protobuf/compiler/mock_code_generator.h               \
+   google/protobuf/compiler/parser_unittest.cc                  \
+   google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc       \
+   google/protobuf/compiler/cpp/cpp_unittest.h                  \
+   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
+   google/protobuf/compiler/cpp/cpp_plugin_unittest.cc          \
+   google/protobuf/compiler/java/java_plugin_unittest.cc        \
+   google/protobuf/compiler/java/java_doc_comment_unittest.cc   \
+   google/protobuf/compiler/python/python_plugin_unittest.cc    \
+   $(COMMON_TEST_SOURCES)
+ nodist_protobuf_test_SOURCES = $(protoc_outputs)
+ 
+ # 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
++                                      -lgtest -lgtest_main
+-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(top_srcdir)/gtest/include    \
+-                                         -I$(top_builddir)/gtest/include  \
+-                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
++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                 \
+   $(COMMON_TEST_SOURCES)
+ nodist_protobuf_lazy_descriptor_test_SOURCES = $(protoc_outputs)
+ 
+ # Build lite_unittest separately, since it doesn't use gtest.
+ protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la
+ protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_test_SOURCES =                                           \
+   google/protobuf/lite_unittest.cc                                     \
+   google/protobuf/test_util_lite.cc                                    \
+   google/protobuf/test_util_lite.h
+ nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outputs)
+ 
+ # 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 =                                          \
+   google/protobuf/compiler/mock_code_generator.cc              \
+   google/protobuf/testing/file.cc                              \
+   google/protobuf/testing/file.h                               \
+   google/protobuf/compiler/test_plugin.cc
+ 
+ if HAVE_ZLIB
+ zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
+ zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc
+ 
+ zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
+ zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc
+ endif
+ 
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)

protobuf-2.6.0-java-fixes.patch Added

@@ -0,0 +1,209 @@
+--- 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"
+   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.6.0</version>
+   <packaging>bundle</packaging>
+   <name>Protocol Buffer Java API</name>
+   <description>
+     Protocol Buffers are a way of encoding structured data in an efficient yet
+     extensible format.
+   </description>
+   <inceptionYear>2008</inceptionYear>
+   <url>http://code.google.com/p/protobuf</url>
+   <licenses>
+     <license>
+       <name>New BSD license</name>
+       <url>http://www.opensource.org/licenses/bsd-license.php</url>
+       <distribution>repo</distribution>
+     </license>
+   </licenses>
+   <scm>
+     <url>http://code.google.com/p/protobuf/source/browse</url>
+     <connection>
+       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>
+         <artifactId>maven-compiler-plugin</artifactId>
+         <configuration>
+           <source>1.5</source>
+           <target>1.5</target>
+         </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>
+             <id>generate-sources</id>
+             <phase>generate-sources</phase>
+             <configuration>
+               <tasks>
+                 <mkdir dir="target/generated-sources" />
+                 <exec executable="../src/protoc">
+                   <arg value="--java_out=target/generated-sources" />
+                   <arg value="--proto_path=../src" />
+                   <arg value="../src/google/protobuf/descriptor.proto" />
+                 </exec>
+               </tasks>
+               <sourceRoot>target/generated-sources</sourceRoot>
+             </configuration>
+             <goals>
+               <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_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" />
+-                  <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/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
+-                    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_import_public_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>
+       <plugin>
+         <groupId>org.apache.felix</groupId>
+         <artifactId>maven-bundle-plugin</artifactId>
+         <extensions>true</extensions>
+         <configuration>
+           <instructions>
+             <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>
+     </plugins>
+   </build>
+   <profiles>
+     <profile>
+       <id>lite</id>
+       <build>
+@@ -173,45 +92,33 @@
+                 <include>**/Internal.java</include>
+                 <include>**/InvalidProtocolBufferException.java</include>
+                 <include>**/LazyStringArrayList.java</include>
+                 <include>**/LazyStringList.java</include>
+                 <include>**/MessageLite.java</include>
+                 <include>**/MessageLiteOrBuilder.java</include>
+                 <include>**/SmallSortedMap.java</include>
+                 <include>**/UninitializedMessageException.java</include>
+                 <include>**/UnmodifiableLazyStringList.java</include>
+                 <include>**/WireFormat.java</include>
+                 <include>**/Parser.java</include>
+                 <include>**/AbstractParser.java</include>
+                 <include>**/BoundedByteString.java</include>
+                 <include>**/LiteralByteString.java</include>
+                 <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>
+-                <testInclude>**/*Lite.java</testInclude>
+-              </testIncludes>
+-            </configuration>
+-          </plugin>
+-          <plugin>
+-            <artifactId>maven-surefire-plugin</artifactId>
+-            <configuration>
+-              <includes>
+-                <include>**/LiteTest.java</include>
+-              </includes>
+             </configuration>
+           </plugin>
+           <plugin>
+             <artifactId>maven-jar-plugin</artifactId>
+             <configuration>
+               <classifier>lite</classifier>
+             </configuration>
+           </plugin>
+         </plugins>
+       </build>
+     </profile>
+   </profiles>
+ </project>