rpms/libpqxx/F-12 libpqxx-2.6.8-gcc43.patch, 1.2, 1.3 libpqxx-2.6.8-visibility-2.patch, 1.2, 1.3 libpqxx-2.6.8-visibility.patch, 1.5, 1.6 .cvsignore, 1.10, 1.11 libpqxx.spec, 1.27, 1.28 sources, 1.10, 1.11
Rex Dieter
rdieter at fedoraproject.org
Tue Sep 29 16:45:39 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/libpqxx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30485
Modified Files:
.cvsignore libpqxx.spec sources
Added Files:
libpqxx-2.6.8-gcc43.patch libpqxx-2.6.8-visibility-2.patch
libpqxx-2.6.8-visibility.patch
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.6.8-14
- Epoch: 1 (revert from libpqxx-3.0.0 on F-12)
libpqxx-2.6.8-gcc43.patch:
binarystring.cxx | 1 +
connection_base.cxx | 2 ++
cursor.cxx | 2 ++
result.cxx | 3 +++
transaction_base.cxx | 2 ++
5 files changed, 10 insertions(+)
Index: libpqxx-2.6.8-gcc43.patch
===================================================================
RCS file: libpqxx-2.6.8-gcc43.patch
diff -N libpqxx-2.6.8-gcc43.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libpqxx-2.6.8-gcc43.patch 29 Sep 2009 16:45:36 -0000 1.3
@@ -0,0 +1,60 @@
+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-visibility-2.patch:
prepared_statement.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: libpqxx-2.6.8-visibility-2.patch
===================================================================
RCS file: libpqxx-2.6.8-visibility-2.patch
diff -N libpqxx-2.6.8-visibility-2.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libpqxx-2.6.8-visibility-2.patch 29 Sep 2009 16:45:37 -0000 1.3
@@ -0,0 +1,12 @@
+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
libpqxx-2.6.8-visibility.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: libpqxx-2.6.8-visibility.patch
===================================================================
RCS file: libpqxx-2.6.8-visibility.patch
diff -N libpqxx-2.6.8-visibility.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libpqxx-2.6.8-visibility.patch 29 Sep 2009 16:45:37 -0000 1.6
@@ -0,0 +1,11 @@
+--- 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 @@
+ echo $ECHO_N "checking g++ visibility attribute... $ECHO_C" >&6; }
+ gcc_visibility=yes
+ SAVE_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror"
++#CXXFLAGS="$CXXFLAGS -Werror"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 10 Apr 2009 13:58:53 -0000 1.10
+++ .cvsignore 29 Sep 2009 16:45:36 -0000 1.11
@@ -1,2 +1,4 @@
-libpqxx-3.0.tar.gz
-libpqxx-3.0.tar.gz.md5sum
+libpqxx-2.6.7.tar.gz
+libpqxx-2.6.8.tar.gz
+libpqxx-2.6.8.tar.gz.md5sum
+libpqxx-2.6.9.tar.gz
Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/F-12/libpqxx.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libpqxx.spec 25 Jul 2009 08:28:15 -0000 1.27
+++ libpqxx.spec 29 Sep 2009 16:45:37 -0000 1.28
@@ -1,6 +1,7 @@
Name: libpqxx
-Version: 3.0
-Release: 2%{?dist}
+Epoch: 1
+Version: 2.6.8
+Release: 14%{?dist}
Summary: C++ client API for PostgreSQL
Group: System Environment/Libraries
@@ -10,8 +11,15 @@ Source0: http://pqxx.org/download
Source1: http://pqxx.org/download/software/libpqxx/libpqxx-%{version}.tar.gz.md5sum
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# 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 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
@@ -34,14 +42,23 @@ Requires: postgresql-devel
%setup -q
# fix spurious permissions
-chmod -x COPYING
+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
+# rpath sucks...
+#sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool
+
make %{?_smp_mflags}
@@ -69,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-*.so
+%{_libdir}/libpqxx-%{version}.so
%files devel
%defattr(-,root,root,-)
@@ -81,11 +98,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.6.8-14
+- Epoch: 1 (revert from libpqxx-3.0.0 on F-12)
-* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> 3.0.0-1
-- libpqxx-3.0
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 10 Apr 2009 13:58:53 -0000 1.10
+++ sources 29 Sep 2009 16:45:37 -0000 1.11
@@ -1,2 +1,2 @@
-57b0fe82ed08df7b8fbe3df313960001 libpqxx-3.0.tar.gz
-b0d0ab5450cfa9d18c204391225c2b63 libpqxx-3.0.tar.gz.md5sum
+cb818ca7698955bcea8b7ba1b7962811 libpqxx-2.6.8.tar.gz
+21cc6ac2cd7bb6fc9a16639c29acbf21 libpqxx-2.6.8.tar.gz.md5sum
More information about the scm-commits
mailing list