diff --git a/.cvsignore b/.cvsignore index b75efbb..bc36d5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libpqxx-2.6.7.tar.gz +libpqxx-2.6.8.tar.gz diff --git a/libpqxx-2.6.8-visibility.patch b/libpqxx-2.6.8-visibility.patch new file mode 100644 index 0000000..002ad48 --- /dev/null +++ b/libpqxx-2.6.8-visibility.patch @@ -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 diff --git a/libpqxx.spec b/libpqxx.spec index 37e191f..1626176 100644 --- a/libpqxx.spec +++ b/libpqxx.spec @@ -1,14 +1,18 @@ Name: libpqxx -Version: 2.6.7 -Release: 2%{?dist} +Version: 2.6.8 +Release: 1%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD URL: http://pqxx.org -Source0: http://thaiopensource.org/download/software/libpqxx/libpqxx-2.6.7.tar.gz +Source0: http://thaiopensource.org/download/software/libpqxx/libpqxx-%{version}.tar.gz 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 + BuildRequires: postgresql-devel BuildRequires: pkgconfig @@ -31,20 +35,29 @@ libraries necessary for developing programs which use libpqxx. %prep %setup -q +%if "%{?fedora}" > "5" +%patch1 -p1 -b .visibility +%endif + %build -%configure --enable-shared --disable-thread-safety --disable-static +%configure --enable-shared --disable-static # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \; +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 @@ -55,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.6.7.so +%{_libdir}/libpqxx-*.so %files devel %doc README-UPGRADE @@ -65,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Wed Sep 20 2006 Rex Dieter 2.6.8-1 +- fc6+: drop -Werror (for now) +- include %%check section (not used, by default) + * Fri Sep 15 2006 Andreas Bierfert 2.6.7-2 - version upgrade diff --git a/sources b/sources index 8bce5a1..7a790fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f66b41065a5e3103a348d378320999e4 libpqxx-2.6.7.tar.gz +cb818ca7698955bcea8b7ba1b7962811 libpqxx-2.6.8.tar.gz