rpms/soci/EL-5 soci-3.0.0-13-fix-gcc43-compatibility.patch, NONE, 1.1 soci-3.0.0-13-fix-gnu-autotools-compatibility.patch, NONE, 1.1 import.log, 1.4, 1.5 soci.spec, 1.4, 1.5 soci-3.0.0-fix-gcc43-compatibility.patch, 1.2, NONE soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.4, NONE

Denis Arnaud denisarnaud at fedoraproject.org
Sat May 23 13:25:30 UTC 2009 

Author: denisarnaud

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

Modified Files:
	import.log soci.spec 
Added Files:
	soci-3.0.0-13-fix-gcc43-compatibility.patch 
	soci-3.0.0-13-fix-gnu-autotools-compatibility.patch 
Removed Files:
	soci-3.0.0-fix-gcc43-compatibility.patch 
	soci-3.0.0-fix-gnu-autotools-compatibility.patch 
Log Message:
* Sat May 23 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-13
- Introduced distinct dependencies for different distributions



soci-3.0.0-13-fix-gcc43-compatibility.patch:

--- NEW FILE soci-3.0.0-13-fix-gcc43-compatibility.patch ---
diff -Nur soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h
--- soci-3.0.0/src/backends/mysql/common.h	2008-07-03 09:22:57.000000000 +0200
+++ soci-3.0.0_4-pack/src/backends/mysql/common.h	2009-05-23 13:11:03.000000000 +0200
@@ -10,6 +10,7 @@
 
 #include <sstream>
 #include "soci-mysql.h"
+#include <ctime>
 
 namespace soci
 {
diff -Nur soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp
--- soci-3.0.0/src/backends/mysql/session.cpp	2008-05-15 15:58:38.000000000 +0200
+++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp	2009-05-23 13:11:03.000000000 +0200
@@ -11,7 +11,8 @@
 #include <cctype>
 #include <cerrno>
 #include <ciso646>
-
+#include <cstdlib>
+#include <climits>
 
 #ifdef _MSC_VER
 #pragma warning(disable:4355)
diff -Nur soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp
--- soci-3.0.0/src/backends/mysql/standard-into-type.cpp	2008-05-30 13:33:45.000000000 +0200
+++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp	2009-05-23 13:11:03.000000000 +0200
@@ -12,6 +12,8 @@
 #include "common.h"
 #include <ciso646>
 #include <cassert>
+#include <ctime>
+#include <cstring>
 
 #ifdef _MSC_VER
 #pragma warning(disable:4355)
diff -Nur soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp
--- soci-3.0.0/src/backends/mysql/standard-use-type.cpp	2008-05-15 15:58:38.000000000 +0200
+++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp	2009-05-23 13:24:42.000000000 +0200
@@ -10,8 +10,10 @@
 #include "soci-mysql.h"
 #include "common.h"
 #include <soci-platform.h>
+//
 #include <ciso646>
 #include <limits>
+#include <cstdio>
 #include <cstring>
 
 #ifdef _MSC_VER
diff -Nur soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp
--- soci-3.0.0/src/backends/mysql/vector-use-type.cpp	2008-05-15 15:58:38.000000000 +0200
+++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp	2009-05-23 13:25:11.000000000 +0200
@@ -10,9 +10,12 @@
 #include "soci-mysql.h"
 #include "common.h"
 #include <soci-platform.h>
+//
 #include <ciso646>
 #include <limits>
+#include <cstdio>
 #include <cstring>
+#include <ctime>
 
 #ifdef _MSC_VER
 #pragma warning(disable:4355)
diff -Nur soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp
--- soci-3.0.0/src/backends/postgresql/common.cpp	2008-06-27 16:38:05.000000000 +0200
+++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp	2009-05-23 13:23:38.000000000 +0200
@@ -7,7 +7,9 @@
 
 #include "common.h"
 #include <soci-backend.h>
+//
 #include <cstdlib>
+#include <cstdio>
 #include <ctime>
 
 
diff -Nur soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp
--- soci-3.0.0/src/core/soci-simple.cpp	2008-07-01 09:42:25.000000000 +0200
+++ soci-3.0.0_4-pack/src/core/soci-simple.cpp	2009-05-23 13:21:14.000000000 +0200
@@ -9,6 +9,8 @@
 
 #include "soci-simple.h"
 #include "soci.h"
+//
+#include <cstdio>
 
 using namespace soci;
 

soci-3.0.0-13-fix-gnu-autotools-compatibility.patch:

--- NEW FILE soci-3.0.0-13-fix-gnu-autotools-compatibility.patch ---
diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4
--- soci-3.0.0_4-pack/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ soci-3.0.0_trep300/aclocal.m4	2009-05-23 10:01:58.000000000 +0200
@@ -0,0 +1,887 @@
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.2], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
[...59368 lines suppressed...]
+would like to develop programs using %{name} and Oracle, you will need
+to install %{name}-oracle.}
+
+
+%package doc
+Summary:        HTML documentation for the @PACKAGE_NAME@ library
+Group:          Documentation
+%if 0%{?fedora} >= 10
+BuildArch:      noarch
+#BuildRequires:  texlive-latex, texlive-dvips
+%endif
+#BuildRequires:  tetex-latex, tetex-dvips
+#BuildRequires:  doxygen, ghostscript
+
+%description doc
+This package contains the documentation in the HTML format of the @PACKAGE_NAME@
+library. The documentation is the same as at the @PACKAGE_NAME@ web page.
+
+
+%prep
+%setup -q
+
+# Apply the g++ 4.3 compatibility patch
+%patch0 -p1
+
+# Rename change-log and license file, so that they comply with
+# packaging standard
+mv CHANGES ChangeLog
+mv LICENSE_1_0.txt COPYING
+rm -f INSTALL
+
+# Remove MacOSX compatibility building files
+rm -f build/unix/._*.tcl
+rm -f ._Makefile ._configure
+rm -f src/core/._*.h src/core/._*.cpp
+rm -f src/backends/postgresql/._*.h
+rm -f doc/._*.html
+
+# Rename the source code directory, so that the files (e.g, header
+# files) can be exported correctly into {_standard_dir}/%{name}
+mv src %{name}
+
+# Apply the GNU Autotools compatibility patch
+%patch1 -p1
+
+# Fix some permissions and formats
+find ./doc -type f -perm 755 -exec chmod 644 {} \;
+chmod -x AUTHORS ChangeLog COPYING NEWS README
+# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;
+
+
+%build
+%configure --disable-static \
+%{?with_mysql:--enable-backend-mysql} \
+%{?with_postgresql:--enable-backend-postgresql} \
+%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}}
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+##
+#  Remove unpackaged files from the buildroot
+rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la
+##
+##
+#  Duplicate the header files, so as to keep the compatibility, for
+#  developers using the SOCI library, with the non-packaged version of
+#  that library.
+for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do
+  cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name}
+done
+%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
+%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
+%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%{?with_mysql:%post mysql -p /sbin/ldconfig
+
+%postun mysql -p /sbin/ldconfig}
+
+%{?with_postgresql:%post postgresql -p /sbin/ldconfig
+
+%postun postgresql -p /sbin/ldconfig}
+
+%{?with_oracle:%post oracle -p /sbin/ldconfig
+
+%postun oracle -p /sbin/ldconfig}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_core.so.*
+
+%{?with_mysql:%files mysql
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_mysql.so.*}
+
+%{?with_postgresql:%files postgresql
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_postgresql.so.*}
+
+%{?with_oracle:%files oracle
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_oracle.so.*}
+
+
+%files devel
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/core
+%{_includedir}/%{name}/*.h
+%{_includedir}/%{name}/core/*.h
+%{_includedir}/%{name}/core/test
+%{_bindir}/%{name}-config
+%{_libdir}/lib%{name}_core.so
+%{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/aclocal/%{name}.m4
+%{_mandir}/man1/%{name}-config.1.*
+
+%{?with_mysql:%files mysql-devel
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/backends/mysql
+%{_libdir}/lib%{name}_mysql.so}
+
+%{?with_postgresql:%files postgresql-devel
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/backends/postgresql
+%{_libdir}/lib%{name}_postgresql.so}
+
+%{?with_oracle:%files oracle-devel
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/backends/oracle
+%{_libdir}/lib%{name}_oracle.so}
+
+
+%files doc
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README doc
+
+
+%changelog
+* Sat May 09 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-13
+- Introduced distinct dependencies for different distributions
+
+* Tue May 05 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-12
+- Removed the dependency on the version of Boost, and on CPPUnit
+
+* Tue May 05 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-11
+- Removed the dependency on Latex for documentation delivery
+
+* Tue May 05 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-10
+- Burried the Boost Fusion header include for core/test/common-tests.h
+
+* Tue May 05 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-9
+- Added a missing cstdio header include for g++-4.4 compatibility
+
+* Tue May 05 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-8
+- Added missing cstdio header includes for g++-4.4 compatibility
+
+* Tue May 05 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-7
+- Added a missing cstdio header include for g++-4.4 compatibility
+
+* Sat May 02 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-6
+- Removed the unused build conditionals
+
+* Tue Apr 28 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-5
+- Simplified the conditional build rules within the RPM specification file
+
+* Sat Apr 18 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-4
+- Fixed an issue about OPTFLAGS compilation
+
+* Tue Apr 14 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-3
+- Restarted from pristine version 3.0.0 of upstream (SOCI) project
+
+* Sat Apr  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-2
+- Specific RPM for each backend
+
+* Fri Mar 27 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-1
+- First RPM release


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/soci/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 May 2009 00:05:44 -0000	1.4
+++ import.log	23 May 2009 13:25:29 -0000	1.5
@@ -2,3 +2,4 @@ soci-3_0_0-6_fc10:EL-5:soci-3.0.0-6.fc10
 soci-3_0_0-10_fc10:EL-5:soci-3.0.0-10.fc10.src.rpm:1241564064
 soci-3_0_0-11_fc10:EL-5:soci-3.0.0-11.fc10.src.rpm:1241566772
 soci-3_0_0-12_fc10:EL-5:soci-3.0.0-12.fc10.src.rpm:1241568056
+soci-3_0_0-13_fc11:EL-5:soci-3.0.0-13.fc11.src.rpm:1243084234


Index: soci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soci/EL-5/soci.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- soci.spec	6 May 2009 00:05:44 -0000	1.4
+++ soci.spec	23 May 2009 13:25:29 -0000	1.5
@@ -18,7 +18,7 @@
 #
 Name:           soci
 Version:        3.0.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 
 Summary:        The database access library for C++ programmers
 
@@ -27,9 +27,9 @@ License:        Boost
 URL:            http://%{name}.sourceforge.net
 Source0:        http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz
 # That patch will be submitted upstream
-Patch0:         %{name}-%{version}-fix-gcc43-compatibility.patch
+Patch0:         %{name}-%{version}-13-fix-gcc43-compatibility.patch
 # That patch will be submitted upstream
-Patch1:         %{name}-%{version}-fix-gnu-autotools-compatibility.patch
+Patch1:         %{name}-%{version}-13-fix-gnu-autotools-compatibility.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -132,8 +132,12 @@ to install %{name}-oracle.}
 %package doc
 Summary:        HTML documentation for the SOCI library
 Group:          Documentation
+%if 0%{?fedora} >= 10
 BuildArch:      noarch
-#BuildRequires:  doxygen, texlive-latex, texlive-dvips, ghostscript
+#BuildRequires:  texlive-latex, texlive-dvips
+%endif
+#BuildRequires:  tetex-latex, tetex-dvips
+#BuildRequires:  doxygen, ghostscript
 
 %description doc
 This package contains the documentation in the HTML format of the SOCI
@@ -142,24 +146,30 @@ library. The documentation is the same a
 
 %prep
 %setup -q
+
+# Apply the g++ 4.3 compatibility patch
+%patch0 -p1
+
 # Rename change-log and license file, so that they comply with
 # packaging standard
 mv CHANGES ChangeLog
 mv LICENSE_1_0.txt COPYING
 rm -f INSTALL
-# Apply the g++ 4.3 compatibility patch
-%patch0 -p1
+
 # Remove MacOSX compatibility building files
 rm -f build/unix/._*.tcl
 rm -f ._Makefile ._configure
-rm -f soci/core/._*.h soci/core/._*.cpp
-rm -f soci/backends/postgresql/._*.h
+rm -f src/core/._*.h src/core/._*.cpp
+rm -f src/backends/postgresql/._*.h
 rm -f doc/._*.html
+
 # Rename the source code directory, so that the files (e.g, header
 # files) can be exported correctly into {_standard_dir}/%{name}
 mv src %{name}
+
 # Apply the GNU Autotools compatibility patch
 %patch1 -p1
+
 # Fix some permissions and formats
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 chmod -x AUTHORS ChangeLog COPYING NEWS README
@@ -277,6 +287,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 09 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-13
+- Introduced distinct dependencies for different distributions
+
 * Tue May 05 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-12
 - Removed the dependency on the version of Boost, and on CPPUnit
 


--- soci-3.0.0-fix-gcc43-compatibility.patch DELETED ---


--- soci-3.0.0-fix-gnu-autotools-compatibility.patch DELETED ---

More information about the scm-commits mailing list