Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2015-03-30 19:30:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2013-11-07 08:43:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf.new/protobuf.changes 2015-03-30 19:30:53.000000000 +0200 @@ -1,0 +2,52 @@ +Sat Feb 28 10:41:07 UTC 2015 - [email protected] + +- Add protobuf-return-no-nonvoid.patch +- Do not install examples +- Remove 0001-Add-generic-GCC-support-for-atomic-operations.patch + +------------------------------------------------------------------- +Fri Feb 27 19:20:16 UTC 2015 - [email protected] + +- Use current url's +- Update dependencies + * python bindings now require recent python-google-apputils + which are available only in recet (13.1 and higher releases of + openSUSE) +- Update to 2.6.1 + * Added atomicops support for Solaris. + * Released memory allocated by InitializeDefaultRepeatedFields() + and GetEmptyString(). Some memory sanitizers reported them + as memory leaks. + * Updated DynamicMessage.setField() to handle repeated enum + values correctly. + * Fixed a bug that caused NullPointerException to be thrown when + converting manually constructed FileDescriptorProto to + FileDescriptor. +- Changes for 2.6.0 + * Added oneofs(unions) feature. Fields in the same oneof will + share memory and at most one field can be set at the same time. + * Files, services, enums, messages, methods and enum values + can be marked as deprecated now. + * Added Support for list values, including lists of mesaages, + when parsing text-formatted protos in C++ and Java. + * Enhanced customization on TestFormat printing. + * Added SwapFields() in reflection API to swap a subset of + fields. + * Added SetAllocatedMessage() in reflection API. + * Repeated primitive extensions are now packable. The + [packed=true] option only affects serializers. Therefore, + it is possible to switch a repeated extension field to + packed format without breaking backwards-compatibility. + * Various speed optimizations. + * writeTo() method in ByteString can now write a substring to + an output stream. Added endWith() method for ByteString. + * ByteString and ByteBuffer are now supported in CodedInputStream + and CodedOutputStream. + * java_generate_equals_and_hash can now be used with the + LITE_RUNTIME. + * A new C++-backed extension module (aka "cpp api v2") that + replaces the old ("cpp api v1") one. Much faster than the + pure Python code. This one resolves many bugs and is + recommended for general use over the pure Python when possible. + +------------------------------------------------------------------- Old: ---- 0001-Add-generic-GCC-support-for-atomic-operations.patch protobuf-2.5.0.tar.bz2 New: ---- protobuf-2.6.1.tar.bz2 protobuf-return-no-nonvoid.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.M7XAVu/_old 2015-03-30 19:30:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M7XAVu/_new 2015-03-30 19:30:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package protobuf # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,34 +16,32 @@ # -%define soname 8 - +%define soname 9 %bcond_without check - +Name: protobuf +Version: 2.6.1 +Release: 0 +Summary: Protocol Buffers - Google's data interchange format +License: BSD-3-Clause +Group: Development/Libraries/C and C++ +Url: https://github.com/google/protobuf/ +Source0: https://github.com/google/protobuf/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +Source1: manifest.txt.in +Source2: baselibs.conf +Patch0: protobuf-setuptools-2.4.1.patch +# fix no-return-in-nonvoid-function google/protobuf/extension_set.cc:74 +Patch1: protobuf-return-no-nonvoid.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora_version} > 8 || 0%{?mandriva_version} > 2008 || 0%{?suse_version} > 1030 %bcond_without protobuf_java %else %bcond_with protobuf_java %endif - -%if 0%{?suse_version} > 1100 +%if 0%{?suse_version} > 1210 && 0%{?suse_version} != 1315 %bcond_without protobuf_python %else %bcond_with protobuf_python %endif - -Name: protobuf -Summary: Protocol Buffers - Google's data interchange format -License: BSD-3-Clause -Group: Development/Libraries/C and C++ -Version: 2.5.0 -Release: 0 -Url: http://code.google.com/p/protobuf/ -Source0: http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2 -Source1: manifest.txt.in -Patch0: protobuf-setuptools-2.4.1.patch -Patch1: 0001-Add-generic-GCC-support-for-atomic-operations.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1010 BuildRequires: fdupes %endif @@ -51,12 +49,16 @@ BuildRequires: java-devel >= 1.6.0 %endif %if %{with protobuf_python} -BuildRequires: gcc-c++ -BuildRequires: python +BuildRequires: python-dateutil BuildRequires: python-devel +BuildRequires: python-google-apputils >= 0.4.2 +BuildRequires: python-python-gflags +BuildRequires: python-pytz BuildRequires: python-setuptools BuildRequires: zlib-devel %endif +BuildRequires: gcc-c++ +BuildRequires: pkg-config %description Protocol Buffers are a way of encoding structured data in an efficient yet @@ -94,37 +96,35 @@ Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ Requires: gcc-c++ -Requires: libprotobuf%{soname} = %version +Requires: libprotobuf%{soname} = %{version} Requires: libprotobuf-lite%{soname} -Provides: libprotobuf-devel = %version Requires: zlib-devel -BuildRequires: pkg-config +Provides: libprotobuf-devel = %{version} %description devel -Development files for Google Protocol Buffers +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. %if %{with protobuf_java} - %package -n %{name}-java -Requires: java >= 1.6.0 Summary: Java Bindings for Google Protocol Buffers Group: Development/Libraries/Java +Requires: java >= 1.6.0 %description -n %{name}-java This package contains the Java bindings for Google Protocol Buffers. %endif %if %{with protobuf_python} - %package -n python-%{name} - +Summary: Python Bindings for Google Protocol Buffers +Group: Development/Libraries/Python %if 0%{?suse_version} %py_requires %else Requires: python %endif -Summary: Python Bindings for Google Protocol Buffers -Group: Development/Libraries/Python %description -n python-%{name} This package contains the Python bindings for Google Protocol Buffers. @@ -133,7 +133,7 @@ %prep %setup -q -%patch0 -p0 +%patch0 %patch1 -p1 %build @@ -141,68 +141,66 @@ #XXX something wents wrong with detecting this export PTHREAD_LIBS=-lpthread %endif -# -%configure --disable-static -%{__make} %{?jobs:-j%jobs} -# + +%configure \ + --disable-static + +make %{?_smp_mflags} + %if %{with protobuf_java} pushd java ../src/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto -%__mkdir classes +mkdir classes %if 0%{?suse_version} == 1110 # 11.1 only workaround # http://en.opensuse.org/Java/Packaging/Cookbook#bytecode_version_error extra_java_flags="-target 1.5 -source 1.5" %endif javac $extra_java_flags -d classes src/main/java/com/google/protobuf/*.java -sed -e 's/@VERSION@/%version/' < %{SOURCE1} > manifest.txt +sed -e 's/@VERSION@/%{version}/' < %{SOURCE1} > manifest.txt jar cfm %{name}-java-%{version}.jar manifest.txt -C classes com popd %endif -# + %if %{with protobuf_python} pushd python -%__python setup.py build +python setup.py build popd %endif %if %{with check} - %check -%{__make} check %{?jobs:-j%jobs} +make %{?_smp_mflags} check %endif %install -%makeinstall -%__install -Dm 0644 editors/proto.vim %{buildroot}%{_datadir}/vim/site/syntax/proto.vim +make DESTDIR=%{buildroot} install %{?_smp_mflags} +install -Dm 0644 editors/proto.vim %{buildroot}%{_datadir}/vim/site/syntax/proto.vim # no need for that -/bin/rm %{buildroot}%{_libdir}/*.la -# +find %{buildroot} -type f -name "*.la" -delete -print + %if %{with protobuf_java} pushd java -%__install -D -m 0644 %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java-%{version}.jar -%__ln_s %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java.jar -%__ln_s %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -D -m 0644 %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java-%{version}.jar +ln -s %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java.jar +ln -s %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar popd %endif -# + %if %{with protobuf_python} pushd python -%__python setup.py install --skip-build \ +python setup.py install --skip-build \ --prefix=%{_prefix} \ --install-data=%{_datadir} \ --root %{buildroot} \ --record-rpm=INSTALLED_FILES popd %endif -# + %if 0%{?suse_version} > 1010 -%fdupes %{buildroot}%{py_sitedir}/%{name}-%{version}-py%{py_ver}.egg-info +%fdupes -s %{buildroot}%{py_sitedir} %endif -%clean -rm -rf $RPM_BUILD_ROOT; - %post -n libprotobuf%{soname} -p /sbin/ldconfig %postun -n libprotobuf%{soname} -p /sbin/ldconfig @@ -229,9 +227,7 @@ %files devel %defattr(-,root,root) -%doc COPYING.txt -%doc CHANGES.txt CONTRIBUTORS.txt README.txt -%doc examples +%doc CHANGES.txt CONTRIBUTORS.txt README.md %{_bindir}/protoc %{_includedir}/google %{_libdir}/*.so @@ -239,14 +235,12 @@ %{_datadir}/vim %if %{with protobuf_java} - %files -n %{name}-java %defattr(-,root,root) %{_javadir}/protobuf* %endif %if %{with protobuf_python} - %files -n python-%{name} -f python/INSTALLED_FILES %defattr(-,root,root) %endif ++++++ protobuf-2.5.0.tar.bz2 -> protobuf-2.6.1.tar.bz2 ++++++ ++++ 94365 lines of diff (skipped) ++++++ protobuf-return-no-nonvoid.patch ++++++ Index: protobuf-2.6.1/src/google/protobuf/extension_set.cc =================================================================== --- protobuf-2.6.1.orig/src/google/protobuf/extension_set.cc +++ protobuf-2.6.1/src/google/protobuf/extension_set.cc @@ -71,6 +71,7 @@ inline bool is_packable(WireFormatLite:: // Do not add a default statement. Let the compiler complain when someone // adds a new wire type. } + return true; } // Registry stuff. ++++++ protobuf-setuptools-2.4.1.patch ++++++ --- /var/tmp/diff_new_pack.M7XAVu/_old 2015-03-30 19:30:56.000000000 +0200 +++ /var/tmp/diff_new_pack.M7XAVu/_new 2015-03-30 19:30:56.000000000 +0200 @@ -1,7 +1,9 @@ python tries to auto download a newer version ... o_O ---- python/ez_setup.py +Index: python/ez_setup.py +=================================================================== +--- python/ez_setup.py.orig +++ python/ez_setup.py -@@ -19,7 +19,7 @@ +@@ -19,7 +19,7 @@ the appropriate options to ``use_setupto This file can also be run as a script to install or upgrade setuptools. """ import sys
