From a6b55d4922c870fcbcc3ff317e03ad40cc9bb3aa091879029bf0d191f81e0249 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 22 Mar 2018 14:24:53 +0000 Subject: [PATCH] - Add BuildRequires: pkgconfig since we install .pc files - Add unixODBC-rpmlintrc: devel files are in the right place OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=52 --- unixODBC-rpmlintrc | 3 +++ unixODBC.changes | 6 ++++++ unixODBC.spec | 20 +++++++++++--------- 3 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 unixODBC-rpmlintrc diff --git a/unixODBC-rpmlintrc b/unixODBC-rpmlintrc new file mode 100644 index 0000000..996ee7e --- /dev/null +++ b/unixODBC-rpmlintrc @@ -0,0 +1,3 @@ +# All .so files are in the main package as many ext apps +# dlopen those so you need these on regular package. +addFilter("devel-file-in-non-devel-package") diff --git a/unixODBC.changes b/unixODBC.changes index 2fd4dd3..3897294 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 22 14:09:43 UTC 2018 - mvetter@suse.com + +- Add BuildRequires: pkgconfig since we install .pc files +- Add unixODBC-rpmlintrc: devel files are in the right place + ------------------------------------------------------------------- Mon Mar 19 12:53:15 UTC 2018 - mvetter@suse.com diff --git a/unixODBC.spec b/unixODBC.spec index 1e04c10..8cd271f 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -25,16 +25,18 @@ Group: Productivity/Databases/Tools Url: http://www.unixodbc.org/ Source0: ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-%{version}.tar.gz Source1: baselibs.conf +Source2: unixODBC-rpmlintrc Patch1: unixODBC-paths.patch Patch2: unixODBC-gccwarnings.patch # https://github.com/lurcher/unixODBC/issues/8 Patch3: unixODBC-2.3.1-libodbcinst-exports.patch -Patch4: unixODBC-2.3.6-declarations.patch +Patch4: unixODBC-2.3.6-declarations.patch BuildRequires: automake BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: libltdl-devel BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: readline-devel # bsc#1062860: to stay feature complete Recommends: psqlODBC @@ -99,14 +101,14 @@ rm -f "%{buildroot}/%{_libdir}"/unixODBC/libodbcpsql.* %license COPYING %attr(644,root,root) %doc AUTHORS ChangeLog NEWS README doc/*.html doc/*.gif %docdir %{_mandir} -%{_mandir}/man1/dltest.1%{ext_man} -%{_mandir}/man1/isql.1%{ext_man} -%{_mandir}/man1/iusql.1%{ext_man} -%{_mandir}/man1/odbc_config.1%{ext_man} -%{_mandir}/man1/odbcinst.1%{ext_man} -%{_mandir}/man5/odbc.ini.5%{ext_man} -%{_mandir}/man5/odbcinst.ini.5%{ext_man} -%{_mandir}/man7/unixODBC.7%{ext_man} +%{_mandir}/man1/dltest.1%{?ext_man} +%{_mandir}/man1/isql.1%{?ext_man} +%{_mandir}/man1/iusql.1%{?ext_man} +%{_mandir}/man1/odbc_config.1%{?ext_man} +%{_mandir}/man1/odbcinst.1%{?ext_man} +%{_mandir}/man5/odbc.ini.5%{?ext_man} +%{_mandir}/man5/odbcinst.ini.5%{?ext_man} +%{_mandir}/man7/unixODBC.7%{?ext_man} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/ODBCDataSources %dir %{_libdir}/%{name}