From d4edcd45e4c067c13878be4a9c8730c1cf165e3597ac8022e8baff8891939be1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 26 Oct 2011 05:45:30 +0000 Subject: [PATCH 1/4] Accepting request 88895 from home:tony2001:branches:devel:tools:building Added list of changes in 2.4.1. OBS-URL: https://build.opensuse.org/request/show/88895 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=13 --- protobuf-2.3.0.tar.bz2 | 3 --- protobuf-2.4.1.tar.bz2 | 3 +++ ...0.patch => protobuf-setuptools-2.4.1.patch | 2 +- protobuf.changes | 24 ++++++++++++++++++- protobuf.spec | 18 ++++++-------- 5 files changed, 34 insertions(+), 16 deletions(-) delete mode 100644 protobuf-2.3.0.tar.bz2 create mode 100644 protobuf-2.4.1.tar.bz2 rename protobuf-setuptools-2.2.0.patch => protobuf-setuptools-2.4.1.patch (92%) diff --git a/protobuf-2.3.0.tar.bz2 b/protobuf-2.3.0.tar.bz2 deleted file mode 100644 index 0b9927a..0000000 --- a/protobuf-2.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:760c7707c3fe9ce801916bbd3067d711a33aa550c01b32d1e1761119cf6280ac -size 1424966 diff --git a/protobuf-2.4.1.tar.bz2 b/protobuf-2.4.1.tar.bz2 new file mode 100644 index 0000000..daab98c --- /dev/null +++ b/protobuf-2.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf +size 1440188 diff --git a/protobuf-setuptools-2.2.0.patch b/protobuf-setuptools-2.4.1.patch similarity index 92% rename from protobuf-setuptools-2.2.0.patch rename to protobuf-setuptools-2.4.1.patch index 56d7ef3..ce34d29 100644 --- a/protobuf-setuptools-2.2.0.patch +++ b/protobuf-setuptools-2.4.1.patch @@ -5,7 +5,7 @@ python tries to auto download a newer version ... o_O This file can also be run as a script to install or upgrade setuptools. """ import sys --DEFAULT_VERSION = "0.6c9" +-DEFAULT_VERSION = "0.6c11" +DEFAULT_VERSION = "0.6c8" DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] diff --git a/protobuf.changes b/protobuf.changes index 9d67a4e..8a1d82d 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,7 +1,29 @@ +------------------------------------------------------------------- +Wed Oct 12 15:46:14 MSD 2011 - tony@daylessday.org + +- Update to Protobuf 2.4.1 +Changes in version 2.4.1: + C++ + * Fixed the frendship problem for old compilers to make the library now gcc 3 + compatible again. + * Fixed vcprojects/extract_includes.bat to extract compiler/plugin.h. + + Java + * Removed usages of JDK 1.6 only features to make the library now JDK 1.5 + compatible again. + * Fixed a bug about negative enum values. + * serialVersionUID is now defined in generated messages for java serializing. + * Fixed protoc to use java.lang.Object, which makes "Object" now a valid + message name again. + + Python + * Experimental C++ implementation now requires C++ protobuf library installed. + See the README.txt in the python directory for details. + ------------------------------------------------------------------- Tue Apr 19 00:23:14 CEST 2011 - ro@suse.de -- update baselibs.conf +- update baselibs.conf ------------------------------------------------------------------- Wed Dec 15 09:42:59 UTC 2010 - lnussel@suse.de diff --git a/protobuf.spec b/protobuf.spec index 8fe5134..f45ae1f 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -1,5 +1,5 @@ # -# spec file for package protobuf (Version 2.3.0) +# spec file for package protobuf # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild -%define soname 6 +%define soname 7 %bcond_without check @@ -35,14 +35,14 @@ Name: protobuf Summary: Protocol Buffers - Google's data interchange format -Version: 2.3.0 -Release: 4 +Version: 2.4.1 +Release: 1 License: New BSD License Group: Development/Libraries/C and C++ 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.2.0.patch +Patch0: protobuf-setuptools-2.4.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ %if 0%{?suse_version} > 1010 @@ -62,7 +62,6 @@ RPC protocols and file formats. %package -n libprotobuf%{soname} - Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries @@ -73,7 +72,6 @@ RPC protocols and file formats. %package -n libprotoc%{soname} - Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries @@ -84,7 +82,6 @@ RPC protocols and file formats. %package -n libprotobuf-lite%{soname} - Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries @@ -98,8 +95,9 @@ License: New BSD License Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ -Requires: gcc-c++ +Requires: gcc-c++ libprotobuf%{soname} = %version-%release libprotobuf-lite%{soname} Provides: libprotobuf-devel = %version-%release +BuildRequires: pkg-config %description devel Development files for Google Protocol Buffers @@ -108,7 +106,6 @@ Development files for Google Protocol Buffers %package -n %{name}-java - Group: Development/Libraries/Java Requires: java >= 1.6.0 Summary: Java Bindings for Google Protocol Buffers @@ -121,7 +118,6 @@ This package contains the Java bindings for Google Protocol Buffers. %package -n python-%{name} - Group: Development/Libraries/Python %if 0%{?suse_version} %py_requires From 1e5cb0d6b349efc25196dc414b872478c2624b429b3906f56001c97effa9c4db Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Dec 2011 12:00:38 +0000 Subject: [PATCH 2/4] adopt baselibs OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=14 --- baselibs.conf | 6 +++--- protobuf.spec | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 66be909..dbc89e0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libprotobuf6 -libprotobuf-lite6 -libprotoc6 +libprotobuf7 +libprotobuf-lite7 +libprotoc7 diff --git a/protobuf.spec b/protobuf.spec index f45ae1f..f72f319 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define soname 7 %bcond_without check @@ -35,10 +33,10 @@ Name: protobuf Summary: Protocol Buffers - Google's data interchange format -Version: 2.4.1 -Release: 1 License: New BSD License Group: Development/Libraries/C and C++ +Version: 2.4.1 +Release: 0 Url: http://code.google.com/p/protobuf/ Source0: http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: manifest.txt.in @@ -52,7 +50,9 @@ BuildRequires: fdupes BuildRequires: java-devel >= 1.6.0 %endif %if %{with protobuf_python} -BuildRequires: python python-devel python-setuptools +BuildRequires: python +BuildRequires: python-devel +BuildRequires: python-setuptools %endif %description @@ -91,7 +91,6 @@ extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package devel -License: New BSD License Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ @@ -106,9 +105,9 @@ Development files for Google Protocol Buffers %package -n %{name}-java -Group: Development/Libraries/Java Requires: java >= 1.6.0 Summary: Java Bindings for Google Protocol Buffers +Group: Development/Libraries/Java %description -n %{name}-java This package contains the Java bindings for Google Protocol Buffers. @@ -118,13 +117,13 @@ This package contains the Java bindings for Google Protocol Buffers. %package -n python-%{name} -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. From 20140cb0960e2a203389a734ddff9ff44c63182fd752861838e28b92bfe98515 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Dec 2011 12:01:18 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=15 --- protobuf.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/protobuf.spec b/protobuf.spec index f72f319..043d074 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define soname 7 %bcond_without check @@ -33,7 +34,7 @@ Name: protobuf Summary: Protocol Buffers - Google's data interchange format -License: New BSD License +License: BSD-3-Clause Group: Development/Libraries/C and C++ Version: 2.4.1 Release: 0 @@ -61,7 +62,6 @@ extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package -n libprotobuf%{soname} - Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries @@ -71,7 +71,6 @@ extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package -n libprotoc%{soname} - Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries @@ -81,7 +80,6 @@ extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package -n libprotobuf-lite%{soname} - Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries @@ -91,7 +89,6 @@ extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package devel - Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ Requires: gcc-c++ libprotobuf%{soname} = %version-%release libprotobuf-lite%{soname} @@ -104,7 +101,6 @@ Development files for Google Protocol Buffers %if %{with protobuf_java} %package -n %{name}-java - Requires: java >= 1.6.0 Summary: Java Bindings for Google Protocol Buffers Group: Development/Libraries/Java From d875545181ae157d8ec5c8e4bb7cf820faee65fdaff48ca19e2f9a4b68a933a8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Dec 2011 09:47:43 +0000 Subject: [PATCH 4/4] - remove %release from requires - Update to Protobuf 2.4.1: OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=16 --- protobuf.changes | 8 ++++++-- protobuf.spec | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/protobuf.changes b/protobuf.changes index 8a1d82d..9d29e71 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,8 +1,12 @@ +------------------------------------------------------------------- +Wed Dec 21 09:47:32 UTC 2011 - coolo@suse.com + +- remove %release from requires + ------------------------------------------------------------------- Wed Oct 12 15:46:14 MSD 2011 - tony@daylessday.org -- Update to Protobuf 2.4.1 -Changes in version 2.4.1: +- Update to Protobuf 2.4.1: C++ * Fixed the frendship problem for old compilers to make the library now gcc 3 compatible again. diff --git a/protobuf.spec b/protobuf.spec index 043d074..78e9809 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define soname 7 %bcond_without check @@ -91,8 +90,8 @@ RPC protocols and file formats. %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ -Requires: gcc-c++ libprotobuf%{soname} = %version-%release libprotobuf-lite%{soname} -Provides: libprotobuf-devel = %version-%release +Requires: gcc-c++ libprotobuf%{soname} = %version libprotobuf-lite%{soname} +Provides: libprotobuf-devel = %version BuildRequires: pkg-config %description devel