From 899190711ea65d6cada37ccd83bfd5760d194fa7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 10 2009 13:58:53 +0000 Subject: housecleaning --- diff --git a/.cvsignore b/.cvsignore index f16a36f..8d1c803 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libpqxx-3.0.tar.gz +libpqxx-3.0.tar.gz.md5sum diff --git a/libpqxx-2.6.8-gcc43.patch b/libpqxx-2.6.8-gcc43.patch deleted file mode 100644 index 5cf2194..0000000 --- a/libpqxx-2.6.8-gcc43.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 - -+#include -+ - #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 - -+#include -+#include -+ - #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 - -+#include -+ - #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 - #endif - -+#include -+ - #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 - #include -+#include - - #include "libpq-fe.h" - diff --git a/libpqxx-2.6.8-visibility.patch b/libpqxx-2.6.8-visibility.patch deleted file mode 100644 index 45a0e59..0000000 --- a/libpqxx-2.6.8-visibility.patch +++ /dev/null @@ -1,36 +0,0 @@ -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" --CXXFLAGS="$CXXFLAGS -Werror" -+#CXXFLAGS="$CXXFLAGS -Werror" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/libpqxx-3.0.tar.gz.md5sum b/libpqxx-3.0.tar.gz.md5sum deleted file mode 100644 index 4ea9eb7..0000000 --- a/libpqxx-3.0.tar.gz.md5sum +++ /dev/null @@ -1 +0,0 @@ -57b0fe82ed08df7b8fbe3df313960001 *libpqxx-3.0.tar.gz diff --git a/libpqxx.spec b/libpqxx.spec index 97b5001..70c3542 100644 --- a/libpqxx.spec +++ b/libpqxx.spec @@ -10,13 +10,8 @@ Source0: http://pqxx.org/download/software/libpqxx/libpqxx-%{version}.tar 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 -Patch2: libpqxx-2.6.8-gcc43.patch Patch3: libpqxx-2.6.8-multilib.patch -BuildRequires: automake libtool BuildRequires: postgresql-devel BuildRequires: pkgconfig @@ -39,25 +34,14 @@ Requires: postgresql-devel %setup -q # fix spurious permissions -chmod -x COPYING INSTALL +chmod -x COPYING -#if ! 0%{?fedora} > 8 -#patch1 -p1 -b .visibility -#endif -#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 suckage -#sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool - make %{?_smp_mflags} diff --git a/sources b/sources index a66c970..f5aacfc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 57b0fe82ed08df7b8fbe3df313960001 libpqxx-3.0.tar.gz +b0d0ab5450cfa9d18c204391225c2b63 libpqxx-3.0.tar.gz.md5sum