From 6ec9a6cef73e9cf094dddc1fb634c9c4d3c7378fe9df7c6554db707b4ea05b63 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Sun, 20 Sep 2020 08:22:25 +0000
Subject: [PATCH] Accepting request 834875 from
 home:jengelh:branches:server:database

- Employ shared library packaging guideline

OBS-URL: https://build.opensuse.org/request/show/834875
OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=60
---
 unixODBC.changes |  8 ++++++++
 unixODBC.spec    | 22 ++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/unixODBC.changes b/unixODBC.changes
index aab60d0..75538f1 100644
--- a/unixODBC.changes
+++ b/unixODBC.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 16 10:47:31 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Employ shared library packaging guideline: new subpacakge
+  libodbc2. mariadb's ha_connect.so wants this library, but a
+  unixODBC's Recommends line would awkwardly pull in psqlODBC
+  by default.
+
 -------------------------------------------------------------------
 Tue Sep  8 19:57:43 UTC 2020 - Michael Vetter <mvetter@suse.com>
 
diff --git a/unixODBC.spec b/unixODBC.spec
index 20037f0..c9c12e9 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -41,6 +41,14 @@ BuildRequires:  readline-devel
 # bsc#1062860: to stay feature complete
 Recommends:     psqlODBC
 
+%package -n libodbc2
+Summary:        Open Database Connectivity API
+Group:          System/Libraries
+
+%description -n libodbc2
+ODBC is an API that abstracts the access to different database
+management systems.
+
 %package devel
 Summary:        Includes for ODBC Development
 Group:          Development/Libraries/C and C++
@@ -80,7 +88,7 @@ autoreconf -fvi
     --enable-driverc \
     --enable-drivers \
     --enable-driver-conf
-make %{?_smp_mflags}
+%make_build
 
 %install
 install -d -m 755 "%{buildroot}/%{_sysconfdir}/%{name}"
@@ -94,8 +102,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 # bsc#1062860: we want psqlODBC instead of this unmaintained example driver
 rm -f "%{buildroot}/%{_libdir}"/unixODBC/libodbcpsql.*
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post   -n libodbc2 -p /sbin/ldconfig
+%postun -n libodbc2 -p /sbin/ldconfig
 
 %files
 %license COPYING
@@ -120,14 +128,16 @@ rm -f "%{buildroot}/%{_libdir}"/unixODBC/libodbcpsql.*
 %{_bindir}/odbcinst
 %{_bindir}/odbc_config
 %{_bindir}/slencheck
-%{_libdir}/libodbc.so.*
-%{_libdir}/libodbcinst.so.*
-%{_libdir}/libodbccr.so.*
 %{_libdir}/libodbc.so
 %{_libdir}/libodbcinst.so
 %{_libdir}/libodbccr.so
 %{_libdir}/%{name}
 
+%files -n libodbc2
+%{_libdir}/libodbc.so.*
+%{_libdir}/libodbcinst.so.*
+%{_libdir}/libodbccr.so.*
+
 # All .so files are in the main package as many ext apps
 # dlopen those so you need these on regular package.
 %files devel