rpms/libpqxx/devel libpqxx-2.6.8-gcc43.patch, NONE, 1.1 libpqxx-2.6.8-multilib.patch, NONE, 1.1 libpqxx-2.6.8-visibility.patch, 1.1, 1.2 libpqxx.spec, 1.20, 1.21

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15153

Modified Files:
	libpqxx-2.6.8-visibility.patch libpqxx.spec 
Added Files:
	libpqxx-2.6.8-gcc43.patch libpqxx-2.6.8-multilib.patch 
Log Message:
* Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2.6.8-10
- gcc43 patch
- fix multilib conflicts (#342331)


libpqxx-2.6.8-gcc43.patch:

--- NEW FILE libpqxx-2.6.8-gcc43.patch ---
diff -up libpqxx-2.6.8/src/transaction_base.cxx.gcc43 libpqxx-2.6.8/src/transaction_base.cxx
--- libpqxx-2.6.8/src/transaction_base.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
+++ libpqxx-2.6.8/src/transaction_base.cxx	2008-02-19 08:19:47.000000000 -0600
@@ -20,6 +20,8 @@
 
 #include <stdexcept>
 
+#include <string.h>
+
 #include "pqxx/connection_base"
 #include "pqxx/result"
 #include "pqxx/tablestream"
diff -up libpqxx-2.6.8/src/result.cxx.gcc43 libpqxx-2.6.8/src/result.cxx
--- libpqxx-2.6.8/src/result.cxx.gcc43	2006-08-29 09:18:37.000000000 -0500
+++ libpqxx-2.6.8/src/result.cxx	2008-02-19 08:18:12.000000000 -0600
@@ -19,6 +19,9 @@
 
 #include <stdexcept>
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "libpq-fe.h"
 
 #include "pqxx/except"
diff -up libpqxx-2.6.8/src/cursor.cxx.gcc43 libpqxx-2.6.8/src/cursor.cxx
--- libpqxx-2.6.8/src/cursor.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
+++ libpqxx-2.6.8/src/cursor.cxx	2008-02-19 08:07:51.000000000 -0600
@@ -19,6 +19,8 @@
 
 #include <cstdlib>
 
+#include <string.h>
+
 #include "pqxx/cursor"
 #include "pqxx/result"
 #include "pqxx/transaction"
diff -up libpqxx-2.6.8/src/connection_base.cxx.gcc43 libpqxx-2.6.8/src/connection_base.cxx
--- libpqxx-2.6.8/src/connection_base.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
+++ libpqxx-2.6.8/src/connection_base.cxx	2008-02-19 08:05:04.000000000 -0600
@@ -40,6 +40,8 @@
 #include <poll.h>
 #endif
 
+#include <string.h>
+
 #include "libpq-fe.h"
 
 #include "pqxx/binarystring"
diff -up libpqxx-2.6.8/src/binarystring.cxx.gcc43 libpqxx-2.6.8/src/binarystring.cxx
--- libpqxx-2.6.8/src/binarystring.cxx.gcc43	2006-03-30 21:28:22.000000000 -0600
+++ libpqxx-2.6.8/src/binarystring.cxx	2008-02-19 08:04:33.000000000 -0600
@@ -18,6 +18,7 @@
 
 #include <new>
 #include <stdexcept>
+#include <string.h>
 
 #include "libpq-fe.h"
 

libpqxx-2.6.8-multilib.patch:

--- NEW FILE libpqxx-2.6.8-multilib.patch ---
diff -up libpqxx-2.6.8/pqxx-config.in.multilib libpqxx-2.6.8/pqxx-config.in
--- libpqxx-2.6.8/pqxx-config.in.multilib	2006-09-04 06:36:59.000000000 -0500
+++ libpqxx-2.6.8/pqxx-config.in	2008-02-19 08:46:56.000000000 -0600
@@ -1,9 +1,6 @@
 #! /bin/sh
 
 prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
 pkgconfig=@PKG_CONFIG@
 
 deprecated() {

libpqxx-2.6.8-visibility.patch:

Index: libpqxx-2.6.8-visibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx-2.6.8-visibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libpqxx-2.6.8-visibility.patch	20 Sep 2006 19:09:14 -0000	1.1
+++ libpqxx-2.6.8-visibility.patch	19 Feb 2008 14:51:38 -0000	1.2
@@ -1,6 +1,31 @@
---- libpqxx-2.6.8/configure.disable_visibility	2006-09-06 04:53:48.000000000 -0500
-+++ libpqxx-2.6.8/configure	2006-09-20 13:51:53.000000000 -0500
-@@ -20203,7 +20203,7 @@
+diff -up libpqxx-2.6.8/configure.ac.in.visibility libpqxx-2.6.8/configure.ac.in
+--- libpqxx-2.6.8/configure.ac.in.visibility	2006-09-04 06:36:59.000000000 -0500
++++ libpqxx-2.6.8/configure.ac.in	2008-02-19 08:33:36.000000000 -0600
+@@ -129,7 +129,7 @@ if test "$GCC" = "yes" ; then
+ AC_MSG_CHECKING([g++ visibility attribute])
+ gcc_visibility=yes
+ SAVE_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror"
++#CXXFLAGS="$CXXFLAGS -Werror"
+ AC_TRY_COMPILE([
+ struct __attribute__ ((visibility("hidden"))) d { d() {} void f() {} };
+ 	],
+diff -up libpqxx-2.6.8/configure.ac.visibility libpqxx-2.6.8/configure.ac
+--- libpqxx-2.6.8/configure.ac.visibility	2006-09-06 04:53:36.000000000 -0500
++++ libpqxx-2.6.8/configure.ac	2008-02-19 08:33:44.000000000 -0600
+@@ -129,7 +129,7 @@ if test "$GCC" = "yes" ; then
+ AC_MSG_CHECKING([g++ visibility attribute])
+ gcc_visibility=yes
+ SAVE_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror"
++#CXXFLAGS="$CXXFLAGS -Werror"
+ AC_TRY_COMPILE([
+ struct __attribute__ ((visibility("hidden"))) d { d() {} void f() {} };
+ 	],
+diff -up libpqxx-2.6.8/configure.visibility libpqxx-2.6.8/configure
+--- libpqxx-2.6.8/configure.visibility	2006-09-06 04:53:48.000000000 -0500
++++ libpqxx-2.6.8/configure	2008-02-19 08:33:47.000000000 -0600
+@@ -20203,7 +20203,7 @@ if test "$GCC" = "yes" ; then
  echo $ECHO_N "checking g++ visibility attribute... $ECHO_C" >&6; }
  gcc_visibility=yes
  SAVE_CXXFLAGS="$CXXFLAGS"


Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libpqxx.spec	18 Feb 2008 20:36:28 -0000	1.20
+++ libpqxx.spec	19 Feb 2008 14:51:38 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           libpqxx
 Version:        2.6.8
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -12,8 +12,11 @@
 
 # drop -Werror for now, since we get -fvisibility warnings using gcc-4.1.1/fc6+
 # http://thaiopensource.org/development/libpqxx/ticket/83
-Patch1:		libpqxx-2.6.8-visibility.patch
+Patch1:         libpqxx-2.6.8-visibility.patch
+Patch2:         libpqxx-2.6.8-gcc43.patch
+Patch3:         libpqxx-2.6.8-multilib.patch
 
+BuildRequires:  automake libtool
 BuildRequires:  postgresql-devel
 BuildRequires:  pkgconfig
 
@@ -28,23 +31,32 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       postgresql-devel
-
 %description devel
-Header files and static libraries necessary for developing programs 
-which use %{name}.
+%{summary}.
 
 
 %prep
 %setup -q
 
+# fix spurious permissions
+chmod -x COPYING INSTALL
+
+#if ! 0%{?fedora} > 8 
 %patch1 -p1 -b .visibility
+#endif
+%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .multilib
+
+# better fix/hack for current rpath issues
+autoreconf
 
 
 %build
 %configure --enable-shared --disable-static
-# I hate rpath... ;)
-%{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \
-libtool
+
+# rpath sucks...
+#sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool
+
 make %{?_smp_mflags}
 
 
@@ -53,7 +65,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{__perl} -pi -e 's,-R/usr/lib,,' $RPM_BUILD_ROOT%{_bindir}/pqxx-config
 
 
 %check 
@@ -79,12 +90,16 @@
 %defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
+%{_includedir}/pqxx/
 %{_libdir}/libpqxx.so
-%{_includedir}/pqxx
 %{_libdir}/pkgconfig/libpqxx.pc
 
 
 %changelog
+* Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2.6.8-10
+- gcc43 patch
+- fix multilib conflicts (#342331)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.6.8-9
 - Autorebuild for GCC 4.3