Accepting request 660491 from science

- Small packaging change for doc subpackage
- Enable additional functionality

OBS-URL: https://build.opensuse.org/request/show/660491
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glpk?expand=0&rev=22

glpk.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 21 10:08:56 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
+
+- Small packaging change for doc subpackage
+- Enable additional functionality
+
 -------------------------------------------------------------------
 Wed Jun 27 13:50:37 UTC 2018 - mpluskal@suse.com
 

glpk.spec

@@ -12,11 +12,12 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define lname   libglpk40
+%define sover   40
+%define lname   libglpk%{sover}
 Name:           glpk
 Version:        4.65
 Release:        0
@@ -30,6 +31,9 @@ Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{
 Patch0:         glpk-no_random_return.patch
 BuildRequires:  ghostscript
 BuildRequires:  gmp-devel
+BuildRequires:  libiodbc-devel
+BuildRequires:  libmariadb-devel
+BuildRequires:  libtool
 BuildRequires:  texlive
 
 %description
@@ -80,17 +84,15 @@ callable library.
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 %configure \
   --with-gmp \
+  --enable-dl \
+  --enable-odbc \
+  --enable-mysql \
   --disable-static
 make %{?_smp_mflags}
 
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-mkdir -p %{buildroot}%{_docdir}/%{name}/examples
-cp examples/*.{mod,c,dat,mps,lp} %{buildroot}%{_docdir}/%{name}/examples
-mkdir %{buildroot}%{_docdir}/%{name}/doc
-cp doc/{*.txt,*.pdf} %{buildroot}%{_docdir}/%{name}/doc
-cp {AUTHORS,ChangeLog,COPYING,NEWS,README} %{buildroot}%{_docdir}/%{name}
 
 %check
 make %{?_smp_mflags} check
@@ -99,24 +101,23 @@ make %{?_smp_mflags} check
 %postun -n %{lname} -p /sbin/ldconfig
 
 %files
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/AUTHORS
-%{_docdir}/%{name}/ChangeLog
-%{_docdir}/%{name}/COPYING
-%{_docdir}/%{name}/NEWS
-%{_docdir}/%{name}/README
 %{_bindir}/glpsol
 
 %files -n %{lname}
-%{_libdir}/libglpk.so.*
+%license AUTHORS COPYING
+%{_libdir}/libglpk.so.%{sover}*
 
 %files devel
 %{_includedir}/*
 %{_libdir}/libglpk.so
 
 %files doc
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/doc
-%{_docdir}/%{name}/examples
+%doc ChangeLog NEWS README
+%doc doc/*.txt doc/*.pdf
+%doc examples/*.mod
+%doc examples/*.c
+%doc examples/*.dat
+%doc examples/*.mps
+%doc examples/*.lp
 
 %changelog