Accepting request 836234 from server:database

OBS-URL: https://build.opensuse.org/request/show/836234
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unixODBC?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2020-09-25 14:21:13 +00:00 committed by Git OBS Bridge
commit 4faab38689
3 changed files with 32 additions and 6 deletions

View File

@ -1,3 +1,5 @@
unixODBC
unixODBC-devel
requires "unixODBC-<targettype> = <version>"
requires "libodbc2-<targettype> = <version>"
libodbc2

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Sep 22 20:27:56 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update requires and baselibs for new libodbc2.
-------------------------------------------------------------------
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>

View File

@ -41,10 +41,19 @@ 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++
Requires: %{name} = %{version}
Requires: libodbc2 = %{version}
Conflicts: libiodbc-devel
%description
@ -80,7 +89,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 +103,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 +129,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