diff --git a/unixODBC-doc-drivers.patch b/unixODBC-doc-drivers.patch new file mode 100644 index 0000000..279ea66 --- /dev/null +++ b/unixODBC-doc-drivers.patch @@ -0,0 +1,27 @@ +From fe24ac16eadd0cf61d8d868f9475eea059f9056b Mon Sep 17 00:00:00 2001 +From: Michael Vetter +Date: Tue, 16 Nov 2021 15:19:14 +0100 +Subject: [PATCH] Mention state of drivers + +--- + Drivers/README | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Drivers/README b/Drivers/README +index 9b59fa5..dde0c71 100644 +--- a/Drivers/README ++++ b/Drivers/README +@@ -8,6 +8,13 @@ + | Drivers | + +-------------------------------------------------------------+ + ++The drivers in here are historical ones or example drivers. ++They are not supported anymore. But can be used as a starting ++point to write your own. ++ ++A list of some third party drivers can be found at: ++http://www.unixodbc.org/drivers.html ++ + Some unixODBC drivers have been coded from scratch while others + have been integerated (tweeked to compile and tested) into + unixODBC. diff --git a/unixODBC-doc-website.patch b/unixODBC-doc-website.patch new file mode 100644 index 0000000..c96112b --- /dev/null +++ b/unixODBC-doc-website.patch @@ -0,0 +1,19 @@ +From f1712186b932581ca8010713565ecdf6f09a2496 Mon Sep 17 00:00:00 2001 +From: Michael Vetter +Date: Tue, 16 Nov 2021 15:08:15 +0100 +Subject: [PATCH] readme: add github and website links + +--- + README | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/README b/README +index 39a259f..07b8fd6 100644 +--- a/README ++++ b/README +@@ -52,3 +52,5 @@ Config Files: + Resources: + + http://sourceforge.net/projects/unixodbc/ ++ https://github.com/lurcher/unixODBC/ ++ http://www.unixodbc.org/ diff --git a/unixODBC.changes b/unixODBC.changes index 463a92d..7d0dda4 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 16 14:55:18 UTC 2021 - Michael Vetter + +- SLE-20556 Expand documentation: + Add: + * unixODBC-doc-website.patch + * unixODBC-doc-drivers.patch + ------------------------------------------------------------------- Thu Feb 4 18:45:24 UTC 2021 - Christophe Giboudeaux diff --git a/unixODBC.spec b/unixODBC.spec index 907e1e7..a73e71f 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -31,6 +31,10 @@ 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 +# SLE-20556 - https://github.com/lurcher/unixODBC/pull/85 +Patch5: unixODBC-doc-drivers.patch +# SLE-20556 - https://github.com/lurcher/unixODBC/pull/84 +Patch6: unixODBC-doc-website.patch BuildRequires: automake BuildRequires: bison BuildRequires: gcc-c++ @@ -69,8 +73,10 @@ Includes for ODBC development (based on unixODBC). %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 -chmod -x NEWS README doc/*.html doc/*.gif +chmod -x NEWS README doc/*.html doc/*.gif Drivers/README %build perl -i -pe 's{^ACLOCAL_AMFLAGS.*}{}' Makefile.am @@ -96,6 +102,9 @@ autoreconf -fvi %install install -d -m 755 "%{buildroot}/%{_sysconfdir}/%{name}" install -d -m 755 "%{buildroot}/%{_libdir}/%{name}" +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/Drivers +cp Drivers/README %{buildroot}/%{_defaultdocdir}/%{name}/Drivers/README + %make_install rm -rf "%{buildroot}/%{_datadir}/libtool" # packaged in gui-gtk @@ -111,6 +120,7 @@ rm -f "%{buildroot}/%{_libdir}"/unixODBC/libodbcpsql.* %files %license COPYING %doc AUTHORS ChangeLog NEWS README doc/*.html doc/*.gif +%doc %{_defaultdocdir}/%{name} %docdir %{_mandir} %{_mandir}/man1/dltest.1%{?ext_man} %{_mandir}/man1/isql.1%{?ext_man}