Accepting request 97515 from devel:tools:building

- remove %release from requires

- Update to Protobuf 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.

- update baselibs.conf

OBS-URL: https://build.opensuse.org/request/show/97515
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf?expand=0&rev=10

baselibs.conf

@@ -1,3 +1,3 @@
-libprotobuf6
+libprotobuf7
-libprotobuf-lite6
+libprotobuf-lite7
-libprotoc6
+libprotoc7

protobuf-2.3.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:760c7707c3fe9ce801916bbd3067d711a33aa550c01b32d1e1761119cf6280ac
-size 1424966

protobuf-2.4.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
+size 1440188

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]
  

protobuf.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+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:
+ 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
 

protobuf.spec

@@ -15,9 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
+%define soname 7
-
-%define soname 6
 
 %bcond_without check
 
@@ -35,14 +33,14 @@
 
 Name:           protobuf
 Summary:        Protocol Buffers - Google's data interchange format
-Version:        2.3.0
+License:        BSD-3-Clause
-Release:        9
-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
-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
@@ -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
@@ -61,8 +61,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
 
@@ -72,8 +70,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
 
@@ -83,8 +79,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
 
@@ -94,12 +88,11 @@ 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++
-Requires:       gcc-c++
+Requires:       gcc-c++ libprotobuf%{soname} = %version libprotobuf-lite%{soname}
-Provides:       libprotobuf-devel = %version-%release
+Provides:       libprotobuf-devel = %version
+BuildRequires:  pkg-config
 
 %description devel
 Development files for Google Protocol Buffers
@@ -107,11 +100,9 @@ Development files for Google Protocol Buffers
 %if %{with protobuf_java}
 
 %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.
@@ -121,14 +112,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.