rpms/libpqxx/EL-5 libpqxx-2.6.8-gcc43.patch, NONE, 1.1 libpqxx-2.6.8-multilib.patch, NONE, 1.1 libpqxx-2.6.8-visibility-2.patch, NONE, 1.1 libpqxx.spec, 1.15, 1.16

Thu Apr 9 18:50:57 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14328

Modified Files:
	libpqxx.spec 
Added Files:
	libpqxx-2.6.8-gcc43.patch libpqxx-2.6.8-multilib.patch 
	libpqxx-2.6.8-visibility-2.patch 
Log Message:
* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13
- properly fix visibility issues


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-2.patch:

--- NEW FILE libpqxx-2.6.8-visibility-2.patch ---
diff -up libpqxx-2.6.8/include/pqxx/prepared_statement.hxx.visibility libpqxx-2.6.8/include/pqxx/prepared_statement.hxx
--- libpqxx-2.6.8/include/pqxx/prepared_statement.hxx.visibility	2006-08-29 10:32:55.000000000 -0500
+++ libpqxx-2.6.8/include/pqxx/prepared_statement.hxx	2009-04-09 13:37:38.000000000 -0500
@@ -138,7 +138,7 @@ private:
 namespace internal
 {
 /// Internal representation of a prepared statement definition
-struct PQXX_PRIVATE prepared_def
+struct PQXX_LIBEXPORT prepared_def
 {
   /// Parameter definition
   struct param


Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/EL-5/libpqxx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libpqxx.spec	17 Aug 2007 14:21:46 -0000	1.15
+++ libpqxx.spec	9 Apr 2009 18:50:26 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           libpqxx
 Version:        2.6.8
-Release:        7%{?dist}
+Release:        13%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -12,8 +12,14 @@
 
 # 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
+# or .. actually fix it.
+Patch1:         libpqxx-2.6.8-visibility.patch
+# or better yet, fix it:
+Patch11:        libpqxx-2.6.8-visibility-2.patch
+Patch2:         libpqxx-2.6.8-gcc43.patch
+Patch3:         libpqxx-2.6.8-multilib.patch
 
+BuildRequires:  automake libtool
 BuildRequires:  postgresql-devel
 BuildRequires:  pkgconfig
 
@@ -23,26 +29,36 @@
 Supersedes older libpq++ interface.
 
 %package devel
-Summary:        Development tools for libpqxx
+Summary:        Development tools for %{name} 
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       postgresql-devel
-
 %description devel
-The libpgxx-devel package contains the header files and static
-libraries necessary for developing programs which use libpqxx.
+%{summary}.
+
 
 %prep
 %setup -q
 
-%patch1 -p1 -b .visibility
+# fix spurious permissions
+chmod -x COPYING INSTALL
+
+%patch11 -p1 -b .visibility
+%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .multilib
+
+# better fix/hack for current rpath and libtool issues
+libtoolize --force
+autoreconf -f -i
+
 
 %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}
 
 
@@ -51,33 +67,56 @@
 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 
 # not enabled, by default, takes awhile.
 %{?_with_check:make check }
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-*.so
+%{_libdir}/libpqxx-%{version}.so
 
 %files devel
 %defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
+%{_includedir}/pqxx/
 %{_libdir}/libpqxx.so
-%{_includedir}/pqxx
 %{_libdir}/pkgconfig/libpqxx.pc
 
+
 %changelog
+* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13
+- properly fix visibility issues
+
+* Tue Mar 03 2009 Robert Scheck <robert at fedoraproject.org> - 2.6.8-12
+- Rebuilt against libtool 2.2
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.8-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* 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
+
+* Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.6.8-8
+- cosmetics
+
 * Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.6.8-7
 - update Source URL's
 


