rpms/protobuf/devel protobuf-2.2.0-fedora-gtest.patch, NONE, 1.1 protobuf.spec, 1.7, 1.8 protobuf-2.0.2-includes.patch, 1.1, NONE protobuf-fedora-gtest.patch, 1.1, NONE protobuf-gcc-4.3.0.patch, 1.1, NONE protobuf-pkgconfig-autotools.patch, 1.1, NONE protobuf.pc.in, 1.1, NONE
Lev Shamardin
abbot at fedoraproject.org
Fri Sep 18 12:56:32 UTC 2009
Author: abbot
Update of /cvs/pkgs/rpms/protobuf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6592
Modified Files:
protobuf.spec
Added Files:
protobuf-2.2.0-fedora-gtest.patch
Removed Files:
protobuf-2.0.2-includes.patch protobuf-fedora-gtest.patch
protobuf-gcc-4.3.0.patch protobuf-pkgconfig-autotools.patch
protobuf.pc.in
Log Message:
updated for protobuf-2.2.0
protobuf-2.2.0-fedora-gtest.patch:
Makefile.am | 21 ---------------------
autogen.sh | 9 ---------
src/Makefile.am | 14 ++++----------
3 files changed, 4 insertions(+), 40 deletions(-)
--- NEW FILE protobuf-2.2.0-fedora-gtest.patch ---
>From 2118fa2281c9554dd93f2fcd917e826d6b191daf Mon Sep 17 00:00:00 2001
From: Lev Shamardin <shamardin at gmail.com>
Date: Fri, 18 Sep 2009 13:20:48 +0400
Subject: [PATCH] fedora-gmake.patch
---
protobuf-2.2.0/Makefile.am | 21 ---------------------
protobuf-2.2.0/autogen.sh | 9 ---------
protobuf-2.2.0/src/Makefile.am | 13 ++++---------
3 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/protobuf-2.2.0/Makefile.am b/protobuf-2.2.0/Makefile.am
index c311fe0..23ee406 100644
--- a/protobuf-2.2.0/Makefile.am
+++ b/protobuf-2.2.0/Makefile.am
@@ -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 --git a/protobuf-2.2.0/autogen.sh b/protobuf-2.2.0/autogen.sh
index 519bb8f..c17e316 100755
--- a/protobuf-2.2.0/autogen.sh
+++ b/protobuf-2.2.0/autogen.sh
@@ -15,15 +15,6 @@ 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 --git a/protobuf-2.2.0/src/Makefile.am b/protobuf-2.2.0/src/Makefile.am
index f009838..373c463 100644
--- a/protobuf-2.2.0/src/Makefile.am
+++ b/protobuf-2.2.0/src/Makefile.am
@@ -267,10 +267,8 @@ COMMON_TEST_SOURCES = \
check_PROGRAMS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test $(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.
@@ -305,11 +303,8 @@ 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
-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 \
--
1.6.2.5
Index: protobuf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/devel/protobuf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- protobuf.spec 1 Sep 2009 23:36:15 -0000 1.7
+++ protobuf.spec 18 Sep 2009 12:56:32 -0000 1.8
@@ -12,18 +12,14 @@
Summary: Protocol Buffers - Google's data interchange format
Name: protobuf
-Version: 2.0.2
-Release: 10%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
License: BSD
Group: Development/Libraries
Source: http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
-Source1: protobuf.pc.in
-Source2: ftdetect-proto.vim
-Patch0: protobuf-pkgconfig-autotools.patch
-Patch1: protobuf-fedora-gtest.patch
+Source1: ftdetect-proto.vim
+Patch1: protobuf-%{version}-fedora-gtest.patch
Patch2: protobuf-java-notests.patch
-Patch3: protobuf-gcc-4.3.0.patch
-Patch4: protobuf-2.0.2-includes.patch
URL: http://code.google.com/p/protobuf/
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: automake autoconf libtool pkgconfig
@@ -72,6 +68,43 @@ 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
@@ -132,30 +165,21 @@ This package contains the API documentat
%prep
%setup -q
-%patch0 -p1
%if !%{without_gtest}
-rm -rf src/gtest
-%patch1 -p1
+rm -rf gtest
+%patch1 -p2
%endif
-cp -p %{SOURCE1} .
chmod 644 examples/*
%if %{with_java}
%patch2
rm -rf java/src/test
%endif
-%patch3 -p0
-%patch4 -p1
%build
+iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
+mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
./autogen.sh
-%if !%{without_gtest}
-export GTEST_CONFIG=`which gtest-config`
-sed -i -e 's|AS_IF(\[test "x$HAVE_GTEST" = "xyes"\],||' -e 's|\[m4_ifval(\[$2\], \[$2\])\],||' -e 's|\[m4_ifval(\[$3\], \[$3\])\])||' aclocal.m4
-autoconf
-%configure --enable-gtest
-%else
%configure
-%endif
make %{?_smp_mflags}
@@ -181,12 +205,13 @@ make %{?_smp_mflags} check
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
popd
%endif
-install -p -m 644 -D %{SOURCE2} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/proto.vim
+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}
@@ -206,6 +231,9 @@ install -pm 644 pom.xml %{buildroot}%{_d
%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
@@ -245,13 +273,26 @@ rm -rf %{buildroot}
%{_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
%{python_sitelib}/google/protobuf/
-%{python_sitelib}/protobuf-2.0.2-py2.6.egg-info/
-%{python_sitelib}/protobuf-2.0.2-py2.6-nspkg.pth
+%{python_sitelib}/protobuf-%{version}-py2.6.egg-info/
+%{python_sitelib}/protobuf-%{version}-py2.6-nspkg.pth
%doc python/README.txt
%doc examples/add_person.py examples/list_people.py examples/addressbook.proto
%endif
@@ -275,11 +316,9 @@ rm -rf %{buildroot}
%endif
%changelog
-* Wed Sep 2 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.0.2-10
-- Fix FTBFS (BZ#511491): fix autotools to find gtest-config
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Sep 18 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-1
+- Upgraded to upstream protobuf-2.2.0
+- New -lite packages
* Sun Mar 01 2009 Caolán McNamra <caolanm at redhat.com> - 2.0.2-8
- add stdio.h for sprintf, perror, etc.
--- protobuf-2.0.2-includes.patch DELETED ---
--- protobuf-fedora-gtest.patch DELETED ---
--- protobuf-gcc-4.3.0.patch DELETED ---
--- protobuf-pkgconfig-autotools.patch DELETED ---
--- protobuf.pc.in DELETED ---
More information about the scm-commits
mailing list