[Opentrep-svn] SF.net SVN: opentrep:[235] branches/soci-3.0.0

[<den...@us...>]

Revision: 235
          http://opentrep.svn.sourceforge.net/opentrep/?rev=235&view=rev
Author:   denis_arnaud
Date:     2011-02-08 21:41:02 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
[Branch 3.0.0] The RPM specification is no longer generated by configure from an .spec.in template.

Modified Paths:
--------------
    branches/soci-3.0.0/configure.ac
    branches/soci-3.0.0/soci.spec

Modified: branches/soci-3.0.0/configure.ac
===================================================================
--- branches/soci-3.0.0/configure.ac	2011-02-08 21:36:00 UTC (rev 234)
+++ branches/soci-3.0.0/configure.ac	2011-02-08 21:41:02 UTC (rev 235)
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script
 #-------------------------------------------------------------------
 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (C) 2004-2009 Maciej Sobczak <mso...@us...>])
+AC_COPYRIGHT([Copyright (C) 2004-2011 Maciej Sobczak <mso...@us...>])
 AC_INIT([SOCI],[3.0.0],[mso...@us...],[soci])
 AC_CONFIG_HEADER([soci/config.h])
 AC_CONFIG_SRCDIR([soci/core/error.cpp])
@@ -10,10 +10,6 @@
 AM_PATH_CPPUNIT(1.10)
 AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
 
-# RPM release number
-RPM_RELEASE="16"
-AC_SUBST(RPM_RELEASE)
-
 # Shared library versioning
 GENERIC_LIBRARY_VERSION="3:0:0"
 #                        | | |
@@ -302,7 +298,6 @@
 	Makefile
 	soci-config
 	soci.pc
-	soci.spec
 	soci/Makefile
 	soci/core/Makefile
 	soci/core/test/Makefile

Modified: branches/soci-3.0.0/soci.spec
===================================================================
--- branches/soci-3.0.0/soci.spec	2011-02-08 21:36:00 UTC (rev 234)
+++ branches/soci-3.0.0/soci.spec	2011-02-08 21:41:02 UTC (rev 235)
@@ -16,29 +16,32 @@
 #
 ##
 #
-Name:           @PACKAGE@
-Version:        @VERSION@
-Release:        @RPM_RELEASE@%{?dist}
+Name:           soci
+Version:        3.0.0
+Release:        19%{?dist}
 
 Summary:        The database access library for C++ programmers
 
 Group:          System Environment/Libraries
 License:        Boost
 URL:            http://%{name}.sourceforge.net
-Source0:        http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # That patch will be submitted upstream
-Patch0:         %{name}-%{version}-@RPM_RELEASE@-fix-gcc44-compatibility.patch
+Patch0:         %{name}-%{version}-gcc44-compatibility.patch
 # That patch will be submitted upstream
-Patch1:         %{name}-%{version}-@RPM_RELEASE@-fix-gnu-autotools-compatibility.patch
+Patch1:         %{name}-%{version}-gnu-autotools-compatibility.patch
+# Patch fixing compilation bug (https://bugzilla.redhat.com/show_bug.cgi?id=631175):
+Patch2:         %{name}-%{version}-make-tab.patch
+# Patch fixing compilation bug with g++ 4.6 (fixed upstream:
+#  http://soci.git.sourceforge.net/git/gitweb.cgi?p=soci/soci;a=commitdiff;h=9e467b5a4ab4cdda6cd801fb76b2d853340dc5d7):
+Patch3:         %{name}-%{version}-backend-default-constructor.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
-#BuildRequires:  cppunit-devel >= 1.10
 BuildRequires:  libtool
-#Requires:       
 
 %description
-@PACKAGE_NAME@ is a C++ database access library that provides the
+%{name} is a C++ database access library that provides the
 illusion of embedding SQL in regular C++ code, staying entirely within
 the C++ standard.
 
@@ -50,9 +53,9 @@
 BuildRequires:  mysql-devel >= 5.0
 
 %description    mysql
-This package contains the MySQL backend for @PACKAGE_NAME@, i.e.,
+This package contains the MySQL backend for SOCI, i.e.,
 dynamic library specific to the MySQL database. If you would like to
-use @PACKAGE_NAME@ in your programs with MySQL, you will need to
+use SOCI in your programs with MySQL, you will need to
 install %{name}-mysql.}
 
 %{?with_postgresql:%package        postgresql
@@ -62,9 +65,9 @@
 BuildRequires:  postgresql-devel >= 7.1
 
 %description    postgresql
-This package contains the PostGreSQL backend for @PACKAGE_NAME@, i.e.,
+This package contains the PostGreSQL backend for SOCI, i.e.,
 dynamic library specific to the PostGreSQL database. If you would like
-to use @PACKAGE_NAME@ in your programs with PostGreSQL, you will need to
+to use SOCI in your programs with PostGreSQL, you will need to
 install %{name}-postgresql.}
 
 %{?with_oracle:%package        oracle
@@ -73,9 +76,9 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    oracle
-This package contains the Oracle backend for @PACKAGE_NAME@, i.e.,
+This package contains the Oracle backend for SOCI, i.e.,
 dynamic library specific to the Oracle database. If you would like to
-use @PACKAGE_NAME@ in your programs with Oracle, you will need to install
+use SOCI in your programs with Oracle, you will need to install
 %{name}-oracle.}
 
 
@@ -130,7 +133,7 @@
 
 
 %package doc
-Summary:        HTML documentation for the @PACKAGE_NAME@ library
+Summary:        HTML documentation for the SOCI library
 Group:          Documentation
 %if 0%{?fedora} >= 10
 BuildArch:      noarch
@@ -140,8 +143,8 @@
 #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.
+This package contains the documentation in the HTML format of the SOCI
+library. The documentation is the same as at the SOCI web page.
 
 
 %prep
@@ -170,6 +173,12 @@
 # Apply the GNU Autotools compatibility patch
 %patch1 -p1
 
+# Apply the patch for the Makefile bug
+%patch2 -p1
+
+# Apply the patch for compilation error with the backend default constructor
+%patch3 -p0
+
 # Fix some permissions and formats
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 chmod -x AUTHORS ChangeLog COPYING NEWS README
@@ -287,6 +296,12 @@
 
 
 %changelog
+* Tue Feb 08 2011 Denis Arnaud <den...@m4...> 3.0.0-19
+- Fixed a compilation error with g++ 4.6 on default constructor definition
+
+* Tue Sep 07 2010 Denis Arnaud <den...@m4...> 3.0.0-18
+- Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)
+
 * Sat Jan 23 2010 Denis Arnaud <den...@m4...> 3.0.0-16
 - Added a missing cstring header include for g++-4.4 compatibility
 
@@ -334,3 +349,4 @@
 
 * Fri Mar 27 2009 Denis Arnaud <den...@m4...> 3.0.0-1
 - First RPM release
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.