From f3b4a7e1a5a07d16d0b9d7907b681232d06a56b3dddfa7a19962c2024936a2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Fri, 7 Dec 2012 08:01:13 +0000
Subject: [PATCH] Accepting request 144391 from home:jengelh:branches:science

- Remove redundant tags/sections from specfile
- Parallel build with %_smp_mflags
- Avoid manual library dependencies; make doc subpackage noarch

OBS-URL: https://build.opensuse.org/request/show/144391
OBS-URL: https://build.opensuse.org/package/show/science/glpk?expand=0&rev=12
---
 glpk.changes |  7 +++++++
 glpk.spec    | 21 +++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/glpk.changes b/glpk.changes
index 4cf8071..12f1d7e 100644
--- a/glpk.changes
+++ b/glpk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec  6 10:21:05 UTC 2012 - jengelh@inai.de
+
+- Remove redundant tags/sections from specfile
+- Parallel build with %_smp_mflags
+- Avoid manual library dependencies; make doc subpackage noarch
+
 -------------------------------------------------------------------
 Mon Oct 31 14:40:30 UTC 2011 - pgajdos@suse.com
 
diff --git a/glpk.spec b/glpk.spec
index 44278c1..18814f1 100644
--- a/glpk.spec
+++ b/glpk.spec
@@ -19,13 +19,13 @@
 Name:           glpk
 Version:        4.47
 Release:        0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        GNU Linear Programming Kit
 License:        GPL-3.0
 Group:          Development/Libraries/C and C++
 Url:            http://www.gnu.org/software/glpk/glpk.html
+
 Source:         %{name}-%{version}.tar.bz2
-Requires:       libglpk0 >= %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ghostscript
 BuildRequires:  texlive
 
@@ -65,7 +65,9 @@ callable library.
 %package doc
 Summary:        GNU Linear Programming Kit
 Group:          Development/Libraries/C and C++
-Requires:       libglpk0 = %{version}
+%if 0%{?suse_version} >= 1120 || 0%{?fedora_version}
+BuildArch:      noarch
+%endif
 
 %description doc
 The GLPK package is intended for solving large-scale linear
@@ -80,10 +82,10 @@ callable library.
 
 %build
 %configure --enable-static=no
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+make install DESTDIR="%buildroot"
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/examples
 cp examples/*.{mod,c,dat,mps,lp} $RPM_BUILD_ROOT%{_docdir}/%{name}/examples
@@ -93,9 +95,6 @@ dvipdf doc/gmpl.dvi doc/gmpl.pdf
 cp doc/{*.txt,*.pdf} $RPM_BUILD_ROOT%{_docdir}/%{name}/doc
 cp {AUTHORS,ChangeLog,COPYING,NEWS,README} $RPM_BUILD_ROOT%{_docdir}/%{name}
 
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
 %post -n libglpk0 -p /sbin/ldconfig
 
 %postun -n libglpk0 -p /sbin/ldconfig
@@ -122,9 +121,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %files doc
 %defattr(-,root,root)
 %dir %{_docdir}/%{name}
-%dir %{_docdir}/%{name}/doc
-%doc %{_docdir}/%{name}/doc/*
-%dir %{_docdir}/%{name}/examples
-%doc %{_docdir}/%{name}/examples/*
+%{_docdir}/%{name}/doc
+%{_docdir}/%{name}/examples
 
 %changelog