rpms/libcompizconfig/devel protobuf_version.patch, NONE, 1.1 libcompizconfig.spec, 1.20, 1.21

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/libcompizconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6454

Modified Files:
	libcompizconfig.spec 
Added Files:
	protobuf_version.patch 
Log Message:
* Sat Sep 29 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-7
- add patch for protobuf version and re-enable protobuf support


protobuf_version.patch:
 configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE protobuf_version.patch ---
--- libcompizconfig-0.8.2/configure
+++ libcompizconfig-0.8.2/configure.new
@@ -19882,7 +19882,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lprotobuf  $LIBS"
+LIBS="-lprotobuf -lpthread $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
--- libcompizconfig-0.8.2/configure.ac
+++ libcompizconfig-0.8.2/configure.ac.new
@@ -105,7 +105,7 @@
     echo -e $protobuf_error_msg; use_protobuf=no
   else
     AC_CHECK_LIB(protobuf, _ZN6google8protobuf7MessageD2Ev, [], [
-      echo -e $protobuf_error_msg; use_protobuf=no ])
+      echo -e $protobuf_error_msg; use_protobuf=no ], -lpthread)
     if test "x$use_protobuf" = "xyes"; then
       AC_LANG([C++])
       AC_CHECK_HEADER([google/protobuf/message.h],,[


Index: libcompizconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcompizconfig/devel/libcompizconfig.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libcompizconfig.spec	19 Sep 2009 12:53:26 -0000	1.20
+++ libcompizconfig.spec	29 Sep 2009 21:40:01 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           libcompizconfig
 Version:        0.8.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Configuration backend for compiz
 
 Group:          System Environment/Libraries
@@ -15,14 +15,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch100:       libcompizconfig-update_pb.patch
 #Patch101:        libcompizconfig-gcc43-buildfix.patch
 #Patch102:        libcompizconfig-gcc43-buildfix2.patch
-
+Patch103:       protobuf_version.patch
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x
 BuildRequires:  compiz-devel >= %{basever}, compiz-bcop >= %{basever}
 BuildRequires:  libX11-devel, gettext, intltool
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  mesa-libGL-devel
-#BuildRequires:  protobuf-devel
+BuildRequires:  protobuf-devel
 
 %description
 The Compiz Project brings 3D desktop visual effects that improve
@@ -48,9 +48,10 @@ developing applications that use %{name}
 %patch100 -p1 -b .libcompizconfig-update_pb
 #%patch101 -p1 -b .gcc43-buildfix
 #%patch102 -p1 -b .gcc43-buildfix2
+%patch103 -p1 -b  .protobuf_version
 
 %build
-%configure --disable-static --disable-protobuf
+%configure --disable-static
            
 make %{?_smp_mflags}
 
@@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 29 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-7
+- add patch for protobuf version and re-enable protobuf support
+
 * Sat Sep 19 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-6
 - disable protobuf support