Accepting request 902556 from home:SeaEagle1:CourierMTA

Fix to allow Factory/Tumbleweed building:
- Set --std=c++14 to allow for deprecated exception definitions

OBS-URL: https://build.opensuse.org/request/show/902556
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/opendbx?expand=0&rev=15

opendbx-1.4.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7f65e71984395b7ac527382a6068bfa3c9f14b27e47d1c478dc7a7480a0fd45
-size 440241

opendbx-1.4.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2246a03812c7d90f10194ad01c2213a7646e383000a800277c6fb8d2bf81497c
+size 587514

opendbx.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Sat Jun 26 21:19:09 UTC 2021 - Ilmar Kruis <ikruis@gmail.com>
+
+- Set --std=c++14 to allow for deprecated exception definitions
+
+-------------------------------------------------------------------
+Mon Apr 20 16:06:23 UTC 2020 - Ilmar Kruis <ikruis@gmail.com>
+
+- Add Leap 15.2 to previous Tumbleweed buildfix
+
+-------------------------------------------------------------------
+Sat Apr 27 21:25:49 UTC 2019 - Ilmar Kruis <ikruis@gmail.com>
+
+- Add new postgresql-server-devel package for Tumbleweed build
+
+-------------------------------------------------------------------
+Tue Jan  8 23:42:06 UTC 2019 - Ilmar Kruis <ikruis@gmail.com>
+
+- Update to 1.4.6
+	* Several bugs fixed
+	* Enhanced determination of column types in SQLite3 backend when SQLite returns a NULL value
+	* Improved recovery from errors in odbx-sql utility
+	* Updated libtool usage to 2.2.6b
+
+-------------------------------------------------------------------
+Fri Dec 28 22:38:49 UTC 2018 - Ilmar Kruis <ikruis@gmail.com>
+
+- Set proper sqlite3 requirements for Tumbleweed / Leap 15
+
+-------------------------------------------------------------------
+Sun Jan 29 17:58:35 UTC 2012 - jengelh@medozas.de
+
+- Remove redundant tags/sections per specfile guideline suggestions
+- Parallel building using %_smp_mflags
+- Enable pkgconfig provides
+
 -------------------------------------------------------------------
 Wed Apr 28 00:37:42 UTC 2010 - mrueckert@suse.de
 

opendbx.spec

@@ -1,42 +1,51 @@
-# norootforbuild
-
 Name:           opendbx
-Version:        1.4.5
+Version:        1.4.6
 Release:        0
 %define pkg_name opendbx
 #
-License:        LGPL
+License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 #
-%if 0%{?suse_version} > 1000
-%define with_opendbx_sqlite3 1
-%define with_opendbx_mysql   1
+%if 0%{?suse_version} > 1000 || 0%{?sle_version} >= 150000
+  %define with_opendbx_sqlite3 1
+  %define with_opendbx_mysql   1
 %endif
-%if 0%{?sles_version} < 11
-%define with_opendbx_sqlite2 1
+
+%if 0%{?sles_version} > 0 && 0%{?sles_version} < 11
+  %define with_opendbx_sqlite2 1
 %endif
+
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  gcc-c++
+BuildRequires:  gcc-c++ pkgconfig
 BuildRequires:  readline-devel
 %if 0%{?with_opendbx_mysql}
 BuildRequires:  mysql-devel
 %endif
 BuildRequires:  postgresql-devel
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 
+BuildRequires:  postgresql-server-devel
+%endif
+
 %if 0%{?with_opendbx_sqlite3}
+  %if 0%{?suse_version} >= 1500
+BuildRequires:  sqlite3-devel
+  %else
 BuildRequires:  sqlite-devel > 3
+  %endif
 %endif
 %if 0%{?with_opendbx_sqlite2}
-%if 0%{?sles_version} == 9
+  %if 0%{?sles_version} == 9
 BuildRequires:  sqlite-devel
-%else
+  %else
 BuildRequires:  sqlite2-devel
+  %endif
 %endif
-%endif
+
 Requires:       %{pkg_name}_backend
 #
 Url:            http://www.linuxnetworks.de/doc/index.php/OpenDBX
-Source:         http://www.linuxnetworks.de/opendbx/download/%{pkg_name}-%{version}.tar.bz2
+Source:         http://www.linuxnetworks.de/opendbx/download/%{pkg_name}-%{version}.tar.gz
 #
 Summary:        A single C interface to various database backends
 %description
@@ -121,7 +130,7 @@ This package holds the development files for opendbx.
 %package backend-mysql
 Group:          Development/Libraries/C and C++
 #
-Requires:       %{pkg_lib_name} = %{version}
+Requires:       %{pkg_libname} = %{version}
 Provides:       %{pkg_name}_backend = %{version}-%{release}
 #
 Summary:        MySQL backend for opendbx
@@ -145,7 +154,7 @@ This package holds the MySQL backend for opendbx.
 %package backend-pgsql
 Group:          Development/Libraries/C and C++
 #
-Requires:       %{pkg_lib_name} = %{version}
+Requires:       %{pkg_libname} = %{version}
 Provides:       %{pkg_name}_backend = %{version}-%{release}
 #
 Summary:        PgSQL backend for opendbx
@@ -168,7 +177,7 @@ This package holds the pgSQL backend for opendbx.
 %package backend-sqlite3
 Group:          Development/Libraries/C and C++
 #
-Requires:       %{pkg_lib_name} = %{version}
+Requires:       %{pkg_libname} = %{version}
 Provides:       %{pkg_name}_backend = %{version}-%{release}
 #
 Summary:        SQLite 3 backend for opendbx
@@ -192,7 +201,7 @@ This package holds the SQLite 3 backend for opendbx.
 %package backend-sqlite2
 Group:          Development/Libraries/C and C++
 #
-Requires:       %{pkg_lib_name} = %{version}
+Requires:       %{pkg_libname} = %{version}
 Provides:       %{pkg_name}_backend = %{version}-%{release}
 #
 Summary:        SQLite 2 backend for opendbx.
@@ -222,7 +231,7 @@ export CFLAGS="%{optflags} \
   $(%{_bindir}/mysql_config --include) \
 %endif
   -I$(/usr/bin/pg_config --includedir) -fno-strict-aliasing"
-export CPPFLAGS="$CFLAGS"
+export CPPFLAGS="$CFLAGS --std=c++14"
 %configure \
   --with-pic \
   --disable-static \
@@ -238,7 +247,7 @@ sqlite \
 sqlite3 \
 %endif
 "
-%{__make}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -246,9 +255,6 @@ find %{buildroot} -type f -name \*.la -print0 | xargs -r0 rm -v
 %find_lang %{pkg_name}
 %find_lang opendbx-utils
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %post   -n %{pkg_libname}      -p /sbin/ldconfig
 %postun -n %{pkg_libname}      -p /sbin/ldconfig
 

series

@@ -1 +0,0 @@
-opendbx-1.4.5_avoid_version.patch